From a52c9c835e9802f749344a08d3ddaa61b0f6b846 Mon Sep 17 00:00:00 2001
From: Changli Gao <xiaosuo@gmail.com>
Date: Mon, 2 Aug 2010 17:56:28 +0200
Subject: [PATCH] --- yaml --- r: 203988 b: refs/heads/master c:
 6661481d5a8975657742c7ed40ae16bdaa7d0a6e h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/net/netfilter/nf_conntrack_core.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ac07871fde74..bdf773291656 100644
--- 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
index 16b41b4e2a3c..df3eedb142ff 100644
--- 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);
 		}
 	}