---

yaml --- r: 203988 b: refs/heads/master c: 6661481 h: refs/heads/master v: v3
git-mirror · Aug 2, 2010 · a52c9c8 · a52c9c8
1 parent 27dd165
commit a52c9c8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2452a99dc0496a90abd0090c280671370c0f3e1c
+refs/heads/master: 6661481d5a8975657742c7ed40ae16bdaa7d0a6e
diff --git a/trunk/net/netfilter/nf_conntrack_core.c b/trunk/net/netfilter/nf_conntrack_core.c
@@ -966,8 +966,7 @@ void __nf_ct_refresh_acct(struct nf_conn *ct,
 		if (acct) {
 			spin_lock_bh(&ct->lock);
 			acct[CTINFO2DIR(ctinfo)].packets++;
-			acct[CTINFO2DIR(ctinfo)].bytes +=
-				skb->len - skb_network_offset(skb);
+			acct[CTINFO2DIR(ctinfo)].bytes += skb->len;
 			spin_unlock_bh(&ct->lock);
 		}
 	}