Changeset 32719


Ignore:
Timestamp:
Jul 16, 2017, 10:30:55 PM (4 days ago)
Author:
brainslayer
Message:

backport

Location:
src/linux/universal/linux-3.2/net/shortcut-fe
Files:
3 edited

Legend:

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

    r32717 r32719  
    336336
    337337        rcu_read_lock();
    338         neigh = sfe_dst_get_neighbour(dst, addr);
     338        neigh = dst_neigh_lookup(dst, addr);
    339339        if (unlikely(!neigh)) {
    340340                rcu_read_unlock();
     
    14491449        if (!test_bit(IPS_FIXED_TIMEOUT_BIT, &ct->status)) {
    14501450                spin_lock_bh(&ct->lock);
    1451                 ct->timeout += sis->delta_jiffies;
     1451                ct->timeout.expires += sis->delta_jiffies;
    14521452                spin_unlock_bh(&ct->lock);
    14531453        }
     
    14561456        if (acct) {
    14571457                spin_lock_bh(&ct->lock);
    1458                 atomic64_add(sis->src_new_packet_count, &SFE_ACCT_COUNTER(acct)[IP_CT_DIR_ORIGINAL].packets);
    1459                 atomic64_add(sis->src_new_byte_count, &SFE_ACCT_COUNTER(acct)[IP_CT_DIR_ORIGINAL].bytes);
    1460                 atomic64_add(sis->dest_new_packet_count, &SFE_ACCT_COUNTER(acct)[IP_CT_DIR_REPLY].packets);
    1461                 atomic64_add(sis->dest_new_byte_count, &SFE_ACCT_COUNTER(acct)[IP_CT_DIR_REPLY].bytes);
     1458                atomic64_add(sis->src_new_packet_count, (atomic64_t *)&SFE_ACCT_COUNTER(acct)[IP_CT_DIR_ORIGINAL].packets);
     1459                atomic64_add(sis->src_new_byte_count, (atomic64_t *)&SFE_ACCT_COUNTER(acct)[IP_CT_DIR_ORIGINAL].bytes);
     1460                atomic64_add(sis->dest_new_packet_count, (atomic64_t *)&SFE_ACCT_COUNTER(acct)[IP_CT_DIR_REPLY].packets);
     1461                atomic64_add(sis->dest_new_byte_count, (atomic64_t *)&SFE_ACCT_COUNTER(acct)[IP_CT_DIR_REPLY].bytes);
    14621462                spin_unlock_bh(&ct->lock);
    14631463        }
  • src/linux/universal/linux-3.2/net/shortcut-fe/sfe_backport.h

    r32717 r32719  
    150150#endif
    151151
    152 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0))
    153 #define sfe_dst_get_neighbour(dst, daddr) dst_neigh_lookup(dst, addr)
    154 #else
    155 static inline struct neighbour *
    156 sfe_dst_get_neighbour(struct dst_entry *dst, void *daddr)
    157 {
    158         struct neighbour *neigh = dst_get_neighbour_noref(dst);
    159 
    160         if (neigh)
    161                 neigh_hold(neigh);
    162 
    163         return neigh;
    164 }
    165152#endif
    166 
    167 
    168 #endif
  • src/linux/universal/linux-3.2/net/shortcut-fe/sfe_cm.c

    r32718 r32719  
    867867                spin_unlock_bh(&ct->lock);
    868868                break;
    869 
    870869        }
    871870
     
    906905}
    907906
     907#ifdef SFE_SUPPORT_IPV6
    908908/*
    909909 * sfe_cm_inet6_event()
     
    919919        return NOTIFY_DONE;
    920920}
    921 
     921#endif
    922922/*
    923923 * sfe_cm_get_exceptions
Note: See TracChangeset for help on using the changeset viewer.