From c34a6712dde68d65483960c5f933f9e294ed8402 Mon Sep 17 00:00:00 2001
From: Changli Gao <xiaosuo@gmail.com>
Date: Fri, 23 Jul 2010 14:07:47 +0200
Subject: [PATCH] --- yaml --- r: 203978 b: refs/heads/master c:
 49daf6a22622d4e1619aeaad5f9f0472bf89daff h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/include/linux/netfilter/xt_quota.h | 2 +-
 trunk/net/netfilter/xt_quota.c           | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b21760e61fe8..2cdffd561e50 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b0c81aa566cccbe26bd99237873fb8428827d82f
+refs/heads/master: 49daf6a22622d4e1619aeaad5f9f0472bf89daff
diff --git a/trunk/include/linux/netfilter/xt_quota.h b/trunk/include/linux/netfilter/xt_quota.h
index 8dc89dfc1361..b0d28c659ab7 100644
--- a/trunk/include/linux/netfilter/xt_quota.h
+++ b/trunk/include/linux/netfilter/xt_quota.h
@@ -11,9 +11,9 @@ struct xt_quota_priv;
 struct xt_quota_info {
 	u_int32_t		flags;
 	u_int32_t		pad;
+	aligned_u64		quota;
 
 	/* Used internally by the kernel */
-	aligned_u64		quota;
 	struct xt_quota_priv	*master;
 };
 
diff --git a/trunk/net/netfilter/xt_quota.c b/trunk/net/netfilter/xt_quota.c
index 304b1fda1a0d..70eb2b4984dd 100644
--- a/trunk/net/netfilter/xt_quota.c
+++ b/trunk/net/netfilter/xt_quota.c
@@ -36,8 +36,6 @@ quota_mt(const struct sk_buff *skb, struct xt_action_param *par)
 		/* we do not allow even small packets from now on */
 		priv->quota = 0;
 	}
-	/* Copy quota back to matchinfo so that iptables can display it */
-	q->quota = priv->quota;
 	spin_unlock_bh(&priv->lock);
 
 	return ret;