netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* xtables: connlimit rev1 addendum
@ 2011-01-20 13:14 Jan Engelhardt
  2011-01-20 13:14 ` [PATCH] netfilter: xtables: remove duplicate member Jan Engelhardt
  2011-01-20 13:18 ` xtables: connlimit rev1 addendum Patrick McHardy
  0 siblings, 2 replies; 3+ messages in thread
From: Jan Engelhardt @ 2011-01-20 13:14 UTC (permalink / raw)
  To: kaber; +Cc: netfilter-devel, jan.rovner


The following changes since commit cc4fc022571376412986e27e08b0765e9cb2aafb:

  netfilter: xtables: connlimit revision 1 (2011-01-19 18:27:46 +0100)

are available in the git repository at:
  git://dev.medozas.de/linux connlimit

Jan Engelhardt (1):
      netfilter: xtables: remove duplicate member

 include/linux/netfilter/xt_connlimit.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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

* [PATCH] netfilter: xtables: remove duplicate member
  2011-01-20 13:14 xtables: connlimit rev1 addendum Jan Engelhardt
@ 2011-01-20 13:14 ` Jan Engelhardt
  2011-01-20 13:18 ` xtables: connlimit rev1 addendum Patrick McHardy
  1 sibling, 0 replies; 3+ messages in thread
From: Jan Engelhardt @ 2011-01-20 13:14 UTC (permalink / raw)
  To: kaber; +Cc: netfilter-devel, jan.rovner

Accidentally missed removing the old out-of-union "inverse" member,
which caused the struct size to change which then gives size mismatch
warnings when using an old iptables.

It is interesting to see that gcc did not warn about this before.
(Filed http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47376 )

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 include/linux/netfilter/xt_connlimit.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/linux/netfilter/xt_connlimit.h b/include/linux/netfilter/xt_connlimit.h
index 8884efc..ab1d3b5 100644
--- a/include/linux/netfilter/xt_connlimit.h
+++ b/include/linux/netfilter/xt_connlimit.h
@@ -18,7 +18,7 @@ struct xt_connlimit_info {
 		};
 #endif
 	};
-	unsigned int limit, inverse;
+	unsigned int limit;
 	union {
 		/* revision 0 */
 		unsigned int inverse;
-- 
1.7.1


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

* Re: xtables: connlimit rev1 addendum
  2011-01-20 13:14 xtables: connlimit rev1 addendum Jan Engelhardt
  2011-01-20 13:14 ` [PATCH] netfilter: xtables: remove duplicate member Jan Engelhardt
@ 2011-01-20 13:18 ` Patrick McHardy
  1 sibling, 0 replies; 3+ messages in thread
From: Patrick McHardy @ 2011-01-20 13:18 UTC (permalink / raw)
  To: Jan Engelhardt; +Cc: netfilter-devel, jan.rovner

Am 20.01.2011 14:14, schrieb Jan Engelhardt:
> The following changes since commit cc4fc022571376412986e27e08b0765e9cb2aafb:
> 
>   netfilter: xtables: connlimit revision 1 (2011-01-19 18:27:46 +0100)
> 
> are available in the git repository at:
>   git://dev.medozas.de/linux connlimit
> 
> Jan Engelhardt (1):
>       netfilter: xtables: remove duplicate member

Pulled, thanks.

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

end of thread, other threads:[~2011-01-20 13:18 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-20 13:14 xtables: connlimit rev1 addendum Jan Engelhardt
2011-01-20 13:14 ` [PATCH] netfilter: xtables: remove duplicate member Jan Engelhardt
2011-01-20 13:18 ` xtables: connlimit rev1 addendum 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).