Changeset 32627


Ignore:
Timestamp:
Jul 9, 2017, 1:27:38 PM (11 days ago)
Author:
brainslayer
Message:

4.9 port fixes

Location:
src/linux/universal/linux-4.9
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src/linux/universal/linux-4.9/include/net/netfilter/nf_conntrack_ecache.h

    r32623 r32627  
    9494                          u32 portid, int report)
    9595{
    96         const struct net *net = nf_ct_net(ct);
    97 
    98         if (!rcu_access_pointer(net->ct.nf_conntrack_event_cb))
    99                 return 0;
    100 
    10196        return nf_conntrack_eventmask_report(1 << event, ct, portid, report);
    10297}
     
    105100nf_conntrack_event(enum ip_conntrack_events event, struct nf_conn *ct)
    106101{
    107         const struct net *net = nf_ct_net(ct);
    108 
    109         if (!rcu_access_pointer(net->ct.nf_conntrack_event_cb))
    110                 return 0;
    111 
    112102        return nf_conntrack_eventmask_report(1 << event, ct, 0, 0);
    113103}
  • src/linux/universal/linux-4.9/net/fast-classifier/fast-classifier.c

    r32626 r32627  
    13841384        if (!test_bit(IPS_FIXED_TIMEOUT_BIT, &ct->status)) {
    13851385                spin_lock_bh(&ct->lock);
    1386                 ct->timeout.expires += sis->delta_jiffies;
     1386                ct->timeout += sis->delta_jiffies;
    13871387                spin_unlock_bh(&ct->lock);
    13881388        }
  • src/linux/universal/linux-4.9/net/shortcut-fe/sfe_cm.c

    r32625 r32627  
    810810        if (!test_bit(IPS_FIXED_TIMEOUT_BIT, &ct->status)) {
    811811                spin_lock_bh(&ct->lock);
    812                 ct->timeout.expires += sis->delta_jiffies;
     812                ct->timeout += sis->delta_jiffies;
    813813                spin_unlock_bh(&ct->lock);
    814814        }
Note: See TracChangeset for help on using the changeset viewer.