netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH iptables] libxt_quota: don't ignore the quota value on deletion
@ 2010-07-24  4:30 Changli Gao
  2010-08-02 16:03 ` Patrick McHardy
  0 siblings, 1 reply; 2+ messages in thread
From: Changli Gao @ 2010-07-24  4:30 UTC (permalink / raw)
  To: Patrick McHardy; +Cc: netfilter-devel, Changli Gao

don't ignore the quota value on deletion, then we can remove a special rule
everytime.

Signed-off-by: Changli Gao <xiaosuo@gmail.com>
----
 extensions/libxt_quota.c           |    2 +-
 include/linux/netfilter/xt_quota.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/extensions/libxt_quota.c b/extensions/libxt_quota.c
index ac7c686..8e28e4c 100644
--- a/extensions/libxt_quota.c
+++ b/extensions/libxt_quota.c
@@ -82,7 +82,7 @@ static struct xtables_match quota_match = {
 	.name		= "quota",
 	.version	= XTABLES_VERSION,
 	.size		= XT_ALIGN(sizeof (struct xt_quota_info)),
-	.userspacesize	= offsetof(struct xt_quota_info, quota),
+	.userspacesize	= offsetof(struct xt_quota_info, master),
 	.help		= quota_help,
 	.parse		= quota_parse,
 	.print		= quota_print,
diff --git a/include/linux/netfilter/xt_quota.h b/include/linux/netfilter/xt_quota.h
index 8dc89df..b0d28c6 100644
--- a/include/linux/netfilter/xt_quota.h
+++ b/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;
 };
 

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH iptables] libxt_quota: don't ignore the quota value on deletion
  2010-07-24  4:30 [PATCH iptables] libxt_quota: don't ignore the quota value on deletion Changli Gao
@ 2010-08-02 16:03 ` Patrick McHardy
  0 siblings, 0 replies; 2+ messages in thread
From: Patrick McHardy @ 2010-08-02 16:03 UTC (permalink / raw)
  To: Changli Gao; +Cc: netfilter-devel

On 24.07.2010 06:30, Changli Gao wrote:
> don't ignore the quota value on deletion, then we can remove a special rule
> everytime.

Applied to iptables-next, thanks.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-08-02 16:03 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-24  4:30 [PATCH iptables] libxt_quota: don't ignore the quota value on deletion Changli Gao
2010-08-02 16:03 ` Patrick McHardy

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).