Patchwork [3/7] netfilter: xtables: remove duplicate member

login
register
mail settings
Submitter Patrick McHardy
Date Jan. 20, 2011, 8:22 p.m.
Message ID <1295554966-5263-4-git-send-email-kaber@trash.net>
Download mbox | patch
Permalink /patch/79761/
State Accepted
Delegated to: David Miller
Headers show

Comments

Patrick McHardy - Jan. 20, 2011, 8:22 p.m.
From: Jan Engelhardt <jengelh@medozas.de>

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(-)

Patch

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;