Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[karo-tx-linux.git] / net / netfilter / nf_conntrack_core.c

diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 5d892febd64ca88d957d6eeffac5de12daeaff77..e22d950c60b3c2a6e4ce7112ce13b9cb54e14d7a 100644 (file)
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -1109,12 +1109,14 @@ void __nf_ct_refresh_acct(struct nf_conn *ct,
 
 acct:
        if (do_acct) {
-               struct nf_conn_counter *acct;
+               struct nf_conn_acct *acct;
 
                acct = nf_conn_acct_find(ct);
                if (acct) {
-                       atomic64_inc(&acct[CTINFO2DIR(ctinfo)].packets);
-                       atomic64_add(skb->len, &acct[CTINFO2DIR(ctinfo)].bytes);
+                       struct nf_conn_counter *counter = acct->counter;
+
+                       atomic64_inc(&counter[CTINFO2DIR(ctinfo)].packets);
+                       atomic64_add(skb->len, &counter[CTINFO2DIR(ctinfo)].bytes);
                }
        }
 }
@@ -1126,13 +1128,15 @@ bool __nf_ct_kill_acct(struct nf_conn *ct,
                       int do_acct)
 {
        if (do_acct) {
-               struct nf_conn_counter *acct;
+               struct nf_conn_acct *acct;
 
                acct = nf_conn_acct_find(ct);
                if (acct) {
-                       atomic64_inc(&acct[CTINFO2DIR(ctinfo)].packets);
+                       struct nf_conn_counter *counter = acct->counter;
+
+                       atomic64_inc(&counter[CTINFO2DIR(ctinfo)].packets);
                        atomic64_add(skb->len - skb_network_offset(skb),
-                                    &acct[CTINFO2DIR(ctinfo)].bytes);
+                                    &counter[CTINFO2DIR(ctinfo)].bytes);
                }
        }