Changeset 32641


Ignore:
Timestamp:
Jul 9, 2017, 5:05:05 PM (2 weeks ago)
Author:
brainslayer
Message:

fix bad merge

Location:
src/linux/universal
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src/linux/universal/linux-3.10/net/shortcut-fe/fast-classifier.c

    r32631 r32641  
    13211321        if (!test_bit(IPS_FIXED_TIMEOUT_BIT, &ct->status)) {
    13221322                spin_lock_bh(&ct->lock);
    1323                 ct->timeout += sis->delta_jiffies;
     1323                ct->timeout.expires += sis->delta_jiffies;
    13241324                spin_unlock_bh(&ct->lock);
    13251325        }
  • src/linux/universal/linux-3.18/net/shortcut-fe/fast-classifier.c

    r32631 r32641  
    13211321        if (!test_bit(IPS_FIXED_TIMEOUT_BIT, &ct->status)) {
    13221322                spin_lock_bh(&ct->lock);
    1323                 ct->timeout += sis->delta_jiffies;
     1323                ct->timeout.expires += sis->delta_jiffies;
    13241324                spin_unlock_bh(&ct->lock);
    13251325        }
  • src/linux/universal/linux-4.4/net/shortcut-fe/fast-classifier.c

    r32631 r32641  
    13211321        if (!test_bit(IPS_FIXED_TIMEOUT_BIT, &ct->status)) {
    13221322                spin_lock_bh(&ct->lock);
    1323                 ct->timeout += sis->delta_jiffies;
     1323                ct->timeout.expires += sis->delta_jiffies;
    13241324                spin_unlock_bh(&ct->lock);
    13251325        }
Note: See TracChangeset for help on using the changeset viewer.