Changeset 32658


Ignore:
Timestamp:
Jul 10, 2017, 3:53:13 PM (2 weeks ago)
Author:
brainslayer
Message:

backport fixes

Location:
src/linux/universal/linux-3.2
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed
  • src/linux/universal/linux-3.2/net/core/dev.c

    r32657 r32658  
    32413241EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister);
    32423242
     3243int (*fast_nat_recv)(struct sk_buff *skb) __rcu __read_mostly;
     3244EXPORT_SYMBOL_GPL(fast_nat_recv);
     3245
     3246
    32433247static int __netif_receive_skb(struct sk_buff *skb)
    32443248{
     
    37603764EXPORT_SYMBOL(napi_gro_frags);
    37613765
    3762 int (*fast_nat_recv)(struct sk_buff *skb) __rcu __read_mostly;
    3763 EXPORT_SYMBOL_GPL(fast_nat_recv);
    37643766
    37653767/*
  • src/linux/universal/linux-3.2/net/netfilter/nf_conntrack_core.c

    r32657 r32658  
    14961496        /*  - and look it like as a confirmed connection */
    14971497        nf_ct_untracked_status_or(IPS_CONFIRMED | IPS_UNTRACKED);
    1498         ATOMIC_INIT_NOTIFIER_HEAD(&net->ct.nf_conntrack_chain);
    14991498
    15001499        return 0;
     
    15651564        if (ret < 0)
    15661565                goto err_ecache;
    1567 
     1566        ATOMIC_INIT_NOTIFIER_HEAD(&net->ct.nf_conntrack_chain);
    15681567        return 0;
    15691568
  • src/linux/universal/linux-3.2/net/netfilter/nf_conntrack_ecache.c

    r32657 r32658  
    6969                e->missed &= ~missed;
    7070                spin_unlock_bh(&ct->lock);
    71                 }
     71               
    7272        }
    7373        return;
  • src/linux/universal/linux-3.2/net/shortcut-fe/fast-classifier.c

    r32657 r32658  
    465465        struct sfe_connection_create *p_sic;
    466466        struct sfe_connection *conn;
     467        struct hlist_node *h;
    467468        u32 key;
    468469
    469470        key = fc_conn_hash(saddr, daddr, sport, dport, is_v4);
    470471
    471         sfe_hash_for_each_possible(fc_conn_ht, conn, hl, key) {
     472        sfe_hash_for_each_possible(h, fc_conn_ht, conn, hl, key) {
    472473                if (conn->is_v4 != is_v4) {
    473474                        continue;
     
    502503        struct sfe_connection_create *p_sic;
    503504        struct sfe_connection *conn;
     505        struct hlist_node *h;
     506        struct hlist_node *h2;
    504507        u32 key;
    505508
    506509        key = fc_conn_hash(saddr, daddr, sport, dport, is_v4);
    507510
    508         sfe_hash_for_each_possible(fc_conn_ht, conn, hl, key) {
     511        sfe_hash_for_each_possible(h, fc_conn_ht, conn, hl, key) {
    509512                if (conn->is_v4 != is_v4) {
    510513                        continue;
     
    527530        key = fc_conn_hash(daddr, saddr, dport, sport, is_v4);
    528531
    529         sfe_hash_for_each_possible(fc_conn_ht, conn, hl, key) {
     532        sfe_hash_for_each_possible(h2, fc_conn_ht, conn, hl, key) {
    530533                if (conn->is_v4 != is_v4) {
    531534                        continue;
     
    13281331        if (acct) {
    13291332                spin_lock_bh(&ct->lock);
    1330                 atomic64_set(&SFE_ACCT_COUNTER(acct)[IP_CT_DIR_ORIGINAL].packets, sis->src_packet_count);
    1331                 atomic64_set(&SFE_ACCT_COUNTER(acct)[IP_CT_DIR_ORIGINAL].bytes, sis->src_byte_count);
    1332                 atomic64_set(&SFE_ACCT_COUNTER(acct)[IP_CT_DIR_REPLY].packets, sis->dest_packet_count);
    1333                 atomic64_set(&SFE_ACCT_COUNTER(acct)[IP_CT_DIR_REPLY].bytes, sis->dest_byte_count);
     1333                atomic64_set((atomic64_t *)&SFE_ACCT_COUNTER(acct)[IP_CT_DIR_ORIGINAL].packets, sis->src_packet_count);
     1334                atomic64_set((atomic64_t *)&SFE_ACCT_COUNTER(acct)[IP_CT_DIR_ORIGINAL].bytes, sis->src_byte_count);
     1335                atomic64_set((atomic64_t *)&SFE_ACCT_COUNTER(acct)[IP_CT_DIR_REPLY].packets, sis->dest_packet_count);
     1336                atomic64_set((atomic64_t *)&SFE_ACCT_COUNTER(acct)[IP_CT_DIR_REPLY].bytes, sis->dest_byte_count);
    13341337                spin_unlock_bh(&ct->lock);
    13351338        }
     
    14421445        struct sfe_connection *conn;
    14431446        u32 i;
     1447        struct hlist_node *h;
    14441448
    14451449        spin_lock_bh(&sfe_connections_lock);
     
    14531457                        atomic_read(&offloaded_fail_msgs),
    14541458                        atomic_read(&done_fail_msgs));
    1455         sfe_hash_for_each(fc_conn_ht, i, conn, hl) {
     1459        sfe_hash_for_each(h, fc_conn_ht, i, conn, hl) {
    14561460                len += scnprintf(buf + len, PAGE_SIZE - len,
    14571461                                (conn->is_v4 ? "o=%d, p=%d [%pM]:%pI4:%u %pI4:%u:[%pM] m=%08x h=%d\n" : "o=%d, p=%d [%pM]:%pI6:%u %pI6:%u:[%pM] m=%08x h=%d\n"),
  • src/linux/universal/linux-3.2/net/shortcut-fe/sfe_backport.h

    r32657 r32658  
    155155#endif
    156156
    157 #define sfe_hash_for_each_possible(name, obj, member, key) \
    158         hash_for_each_possible(name, obj, member, key)
     157#define sfe_hash_for_each_possible(h, name, obj, member, key) \
     158        hash_for_each_possible(h, name, obj, member, key)
    159159
    160 #define sfe_hash_for_each(name, bkt, obj, member) \
    161         hash_for_each(name, bkt, obj, member)
     160#define sfe_hash_for_each(h, name, bkt, obj, member) \
     161        hash_for_each(h, name, bkt, obj, member)
    162162
    163163#endif
  • src/linux/universal/linux-3.2/net/shortcut-fe/sfe_cm.c

    r32657 r32658  
    388388        acct = nf_conn_acct_find(ct);
    389389        if (acct) {
    390                 long long packets = atomic64_read(&SFE_ACCT_COUNTER(acct)[CTINFO2DIR(ctinfo)].packets);
     390                long long packets = atomic64_read((atomic64_t *)&SFE_ACCT_COUNTER(acct)[CTINFO2DIR(ctinfo)].packets);
    391391                if ((packets > 0xff) && (packets & 0xff)) {
    392392                        /*
     
    825825        if (acct) {
    826826                spin_lock_bh(&ct->lock);
    827                 atomic64_add(sis->src_new_packet_count, &SFE_ACCT_COUNTER(acct)[IP_CT_DIR_ORIGINAL].packets);
    828                 atomic64_add(sis->src_new_byte_count, &SFE_ACCT_COUNTER(acct)[IP_CT_DIR_ORIGINAL].bytes);
    829                 atomic64_add(sis->dest_new_packet_count, &SFE_ACCT_COUNTER(acct)[IP_CT_DIR_REPLY].packets);
    830                 atomic64_add(sis->dest_new_byte_count, &SFE_ACCT_COUNTER(acct)[IP_CT_DIR_REPLY].bytes);
     827                atomic64_add(sis->src_new_packet_count, (atomic64_t *)&SFE_ACCT_COUNTER(acct)[IP_CT_DIR_ORIGINAL].packets);
     828                atomic64_add(sis->src_new_byte_count, (atomic64_t *)&SFE_ACCT_COUNTER(acct)[IP_CT_DIR_ORIGINAL].bytes);
     829                atomic64_add(sis->dest_new_packet_count, (atomic64_t *)&SFE_ACCT_COUNTER(acct)[IP_CT_DIR_REPLY].packets);
     830                atomic64_add(sis->dest_new_byte_count, (atomic64_t *)&SFE_ACCT_COUNTER(acct)[IP_CT_DIR_REPLY].bytes);
    831831                spin_unlock_bh(&ct->lock);
    832832        }
Note: See TracChangeset for help on using the changeset viewer.