From: Jan Engelhardt <jengelh@medozas.de>
Date: Thu, 20 Jan 2011 13:01:12 +0000 (+0100)
Subject: netfilter: xtables: remove duplicate member
X-Git-Tag: v2.6.39-rc1~468^2~509^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ba12b130a65840005770135a69199cb9adaf8c8f;p=platform%2Fkernel%2Flinux-exynos.git

netfilter: xtables: remove duplicate member

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

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;