From: Harald Welte <laforge@netfilter.org>
Date: Tue, 11 Oct 2005 03:52:36 +0000 (-0700)
Subject: [NETFILTER] nat: remove bogus structure member
X-Git-Tag: v2.6.14-rc5~68^2~15
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b3a91d037a2575040f9b6a483f60c407a3d80368;p=linux-2.6-omap-h63xx.git

[NETFILTER] nat: remove bogus structure member

When 'rustynat' was merged in 2.6.12, the use of the "helper" pointer of
struct ipt_nat_info was obsoleted, but the pointer not removed from the
struct.

This patch removes the pointer, thereby yet again shrinking struct
ip_conntrack.

Discovered-by: Rusty Russell <rusty@netfilter.org>
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/include/linux/netfilter_ipv4/ip_nat.h b/include/linux/netfilter_ipv4/ip_nat.h
index e201ec6e990..41a107de17c 100644
--- a/include/linux/netfilter_ipv4/ip_nat.h
+++ b/include/linux/netfilter_ipv4/ip_nat.h
@@ -58,10 +58,6 @@ extern rwlock_t ip_nat_lock;
 struct ip_nat_info
 {
 	struct list_head bysource;
-
-	/* Helper (NULL if none). */
-	struct ip_nat_helper *helper;
-
 	struct ip_nat_seq seq[IP_CT_DIR_MAX];
 };