From 8c45bcab3a8795639326bf641ac23d31a28ce996 Mon Sep 17 00:00:00 2001
From: Changli Gao <xiaosuo@gmail.com>
Date: Fri, 23 Jul 2010 16:24:34 +0200
Subject: [PATCH] --- yaml --- r: 203979 b: refs/heads/master c:
 261abc8c964e018256c1bcbd99b8a208c624d7cc h: refs/heads/master i:   203977:
 55d0c9a11410c43764ec3c5025aee81fabc5fd06   203975:
 899993d31074f578f315e4b4f151ceaf1dfbf917 v: v3

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

diff --git a/[refs] b/[refs]
index 2cdffd561e50..ea2c9016dede 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49daf6a22622d4e1619aeaad5f9f0472bf89daff
+refs/heads/master: 261abc8c964e018256c1bcbd99b8a208c624d7cc
diff --git a/trunk/net/ipv6/netfilter/ip6_tables.c b/trunk/net/ipv6/netfilter/ip6_tables.c
index dc41d6d3c6c6..33113c1ea02f 100644
--- a/trunk/net/ipv6/netfilter/ip6_tables.c
+++ b/trunk/net/ipv6/netfilter/ip6_tables.c
@@ -387,9 +387,7 @@ ip6t_do_table(struct sk_buff *skb,
 				goto no_match;
 		}
 
-		ADD_COUNTER(e->counters,
-			    ntohs(ipv6_hdr(skb)->payload_len) +
-			    sizeof(struct ipv6hdr), 1);
+		ADD_COUNTER(e->counters, skb->len, 1);
 
 		t = ip6t_get_target_c(e);
 		IP_NF_ASSERT(t->u.kernel.target);