From 91330df37cbcd08b5a56fe21395cf496fbe73fe8 Mon Sep 17 00:00:00 2001
From: "/C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net"
 </C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net>
Date: Sun, 2 Sep 2007 13:09:07 +0000
Subject: [PATCH]: Remove last vestiges of NFC (Peter Riley
 <Peter.Riley@hotpop.com>)

---
 extensions/libip6t_HL.c         | 2 +-
 extensions/libip6t_LOG.c        | 2 +-
 extensions/libip6t_REJECT.c     | 2 +-
 extensions/libip6t_ah.c         | 3 +--
 extensions/libip6t_condition.c  | 2 +-
 extensions/libip6t_dst.c        | 3 +--
 extensions/libip6t_eui64.c      | 1 -
 extensions/libip6t_frag.c       | 3 +--
 extensions/libip6t_hbh.c        | 3 +--
 extensions/libip6t_hl.c         | 2 +-
 extensions/libip6t_icmp6.c      | 3 +--
 extensions/libip6t_ipv6header.c | 3 +--
 extensions/libip6t_mh.c         | 3 +--
 extensions/libip6t_owner.c      | 1 -
 extensions/libip6t_policy.c     | 4 +---
 extensions/libip6t_rt.c         | 3 +--
 extensions/libip6t_state.c      | 1 -
 extensions/libipt_CLUSTERIP.c   | 2 +-
 extensions/libipt_ECN.c         | 2 +-
 extensions/libipt_LOG.c         | 2 +-
 extensions/libipt_MASQUERADE.c  | 2 +-
 extensions/libipt_MIRROR.c      | 2 +-
 extensions/libipt_NETMAP.c      | 2 +-
 extensions/libipt_REDIRECT.c    | 2 +-
 extensions/libipt_REJECT.c      | 2 +-
 extensions/libipt_SAME.c        | 2 +-
 extensions/libipt_SET.c         | 2 +-
 extensions/libipt_TOS.c         | 2 +-
 extensions/libipt_TTL.c         | 2 +-
 extensions/libipt_ULOG.c        | 2 +-
 extensions/libipt_addrtype.c    | 2 +-
 extensions/libipt_ah.c          | 3 +--
 extensions/libipt_condition.c   | 2 +-
 extensions/libipt_connrate.c    | 1 -
 extensions/libipt_conntrack.c   | 1 -
 extensions/libipt_ecn.c         | 1 -
 extensions/libipt_icmp.c        | 3 +--
 extensions/libipt_iprange.c     | 1 -
 extensions/libipt_owner.c       | 1 -
 extensions/libipt_policy.c      | 4 +---
 extensions/libipt_realm.c       | 1 -
 extensions/libipt_recent.c      | 3 +--
 extensions/libipt_set.c         | 4 ++--
 extensions/libipt_tos.c         | 1 -
 extensions/libipt_ttl.c         | 2 +-
 extensions/libipt_unclean.c     | 1 -
 extensions/libxt_CLASSIFY.c     | 2 +-
 extensions/libxt_CONNMARK.c     | 2 +-
 extensions/libxt_DSCP.c         | 2 +-
 extensions/libxt_MARK.c         | 2 +-
 extensions/libxt_NFLOG.c        | 2 +-
 extensions/libxt_NFQUEUE.c      | 2 +-
 extensions/libxt_NOTRACK.c      | 2 +-
 extensions/libxt_SECMARK.c      | 2 +-
 extensions/libxt_TCPMSS.c       | 2 +-
 extensions/libxt_TRACE.c        | 2 +-
 extensions/libxt_comment.c      | 1 -
 extensions/libxt_connbytes.c    | 1 -
 extensions/libxt_connlimit.c    | 4 +---
 extensions/libxt_connmark.c     | 1 -
 extensions/libxt_dccp.c         | 4 +---
 extensions/libxt_dscp.c         | 1 -
 extensions/libxt_esp.c          | 3 +--
 extensions/libxt_hashlimit.c    | 3 +--
 extensions/libxt_helper.c       | 1 -
 extensions/libxt_length.c       | 1 -
 extensions/libxt_limit.c        | 3 +--
 extensions/libxt_mac.c          | 1 -
 extensions/libxt_mark.c         | 1 -
 extensions/libxt_multiport.c    | 6 +-----
 extensions/libxt_physdev.c      | 3 +--
 extensions/libxt_pkttype.c      | 1 -
 extensions/libxt_quota.c        | 2 +-
 extensions/libxt_sctp.c         | 4 +---
 extensions/libxt_standard.c     | 2 +-
 extensions/libxt_state.c        | 1 -
 extensions/libxt_statistic.c    | 1 -
 extensions/libxt_string.c       | 3 +--
 extensions/libxt_tcp.c          | 3 +--
 extensions/libxt_tcpmss.c       | 1 -
 extensions/libxt_udp.c          | 3 +--
 include/xtables.h               | 5 ++---
 ip6tables.c                     | 9 ++++-----
 iptables.c                      | 9 ++++-----
 libiptc/libip4tc.c              | 8 ++------
 libiptc/libip6tc.c              | 8 ++------
 86 files changed, 73 insertions(+), 139 deletions(-)

diff --git a/extensions/libip6t_HL.c b/extensions/libip6t_HL.c
index d215eaa..1330c4e 100644
--- a/extensions/libip6t_HL.c
+++ b/extensions/libip6t_HL.c
@@ -16,7 +16,7 @@
 
 #define IP6T_HL_USED	1
 
-static void init(struct xt_entry_target *t, unsigned int *nfcache)
+static void init(struct xt_entry_target *t)
 {
 }
 
diff --git a/extensions/libip6t_LOG.c b/extensions/libip6t_LOG.c
index a11b8c0..7106d16 100644
--- a/extensions/libip6t_LOG.c
+++ b/extensions/libip6t_LOG.c
@@ -44,7 +44,7 @@ static const struct option opts[] = {
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 	struct ip6t_log_info *loginfo = (struct ip6t_log_info *)t->data;
 
diff --git a/extensions/libip6t_REJECT.c b/extensions/libip6t_REJECT.c
index c67de0e..60a6390 100644
--- a/extensions/libip6t_REJECT.c
+++ b/extensions/libip6t_REJECT.c
@@ -72,7 +72,7 @@ static const struct option opts[] = {
 
 /* Allocate and initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 	struct ip6t_reject_info *reject = (struct ip6t_reject_info *)t->data;
 
diff --git a/extensions/libip6t_ah.c b/extensions/libip6t_ah.c
index d3048a2..e96ba20 100644
--- a/extensions/libip6t_ah.c
+++ b/extensions/libip6t_ah.c
@@ -72,7 +72,7 @@ parse_ah_spis(const char *spistring, u_int32_t *spis)
 
 /* Initialize the match. */
 static void
-init(struct xt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
 	struct ip6t_ah *ahinfo = (struct ip6t_ah *)m->data;
 
@@ -86,7 +86,6 @@ init(struct xt_entry_match *m, unsigned int *nfcache)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	struct ip6t_ah *ahinfo = (struct ip6t_ah *)(*match)->data;
diff --git a/extensions/libip6t_condition.c b/extensions/libip6t_condition.c
index 40d0522..d299902 100644
--- a/extensions/libip6t_condition.c
+++ b/extensions/libip6t_condition.c
@@ -26,7 +26,7 @@ static const struct option opts[] = {
 
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
-      const void *entry, unsigned int *nfcache,
+      const void *entry,
       struct xt_entry_match **match)
 {
 	struct condition6_info *info =
diff --git a/extensions/libip6t_dst.c b/extensions/libip6t_dst.c
index cb49c1f..2207c3f 100644
--- a/extensions/libip6t_dst.c
+++ b/extensions/libip6t_dst.c
@@ -118,7 +118,7 @@ parse_options(const char *optsstr, u_int16_t *opts)
 
 /* Initialize the match. */
 static void
-init(struct xt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
 	struct ip6t_opts *optinfo = (struct ip6t_opts *)m->data;
 
@@ -133,7 +133,6 @@ init(struct xt_entry_match *m, unsigned int *nfcache)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	struct ip6t_opts *optinfo = (struct ip6t_opts *)(*match)->data;
diff --git a/extensions/libip6t_eui64.c b/extensions/libip6t_eui64.c
index e95944b..a38af34 100644
--- a/extensions/libip6t_eui64.c
+++ b/extensions/libip6t_eui64.c
@@ -27,7 +27,6 @@ help(void)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	return 0;
diff --git a/extensions/libip6t_frag.c b/extensions/libip6t_frag.c
index 1e184b7..014351e 100644
--- a/extensions/libip6t_frag.c
+++ b/extensions/libip6t_frag.c
@@ -78,7 +78,7 @@ parse_frag_ids(const char *idstring, u_int32_t *ids)
 
 /* Initialize the match. */
 static void
-init(struct xt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
 	struct ip6t_frag *fraginfo = (struct ip6t_frag *)m->data;
 
@@ -94,7 +94,6 @@ init(struct xt_entry_match *m, unsigned int *nfcache)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	struct ip6t_frag *fraginfo = (struct ip6t_frag *)(*match)->data;
diff --git a/extensions/libip6t_hbh.c b/extensions/libip6t_hbh.c
index c139c23..533d510 100644
--- a/extensions/libip6t_hbh.c
+++ b/extensions/libip6t_hbh.c
@@ -117,7 +117,7 @@ parse_options(const char *optsstr, u_int16_t *opts)
 
 /* Initialize the match. */
 static void
-init(struct xt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
 	struct ip6t_opts *optinfo = (struct ip6t_opts *)m->data;
 
@@ -132,7 +132,6 @@ init(struct xt_entry_match *m, unsigned int *nfcache)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	struct ip6t_opts *optinfo = (struct ip6t_opts *)(*match)->data;
diff --git a/extensions/libip6t_hl.c b/extensions/libip6t_hl.c
index 197ef85..20aff60 100644
--- a/extensions/libip6t_hl.c
+++ b/extensions/libip6t_hl.c
@@ -26,7 +26,7 @@ static void help(void)
 }
 
 static int parse(int c, char **argv, int invert, unsigned int *flags,
-		const void *entry, unsigned int *nfcache,
+		const void *entry,
 		struct xt_entry_match **match)
 {
 	struct ip6t_hl_info *info = (struct ip6t_hl_info *) (*match)->data;
diff --git a/extensions/libip6t_icmp6.c b/extensions/libip6t_icmp6.c
index 46c9d38..5c06c04 100644
--- a/extensions/libip6t_icmp6.c
+++ b/extensions/libip6t_icmp6.c
@@ -145,7 +145,7 @@ parse_icmpv6(const char *icmpv6type, u_int8_t *type, u_int8_t code[])
 
 /* Initialize the match. */
 static void
-init(struct xt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
 	struct ip6t_icmp *icmpv6info = (struct ip6t_icmp *)m->data;
 
@@ -157,7 +157,6 @@ init(struct xt_entry_match *m, unsigned int *nfcache)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	struct ip6t_icmp *icmpv6info = (struct ip6t_icmp *)(*match)->data;
diff --git a/extensions/libip6t_ipv6header.c b/extensions/libip6t_ipv6header.c
index 4dab33f..3d21f45 100644
--- a/extensions/libip6t_ipv6header.c
+++ b/extensions/libip6t_ipv6header.c
@@ -155,7 +155,7 @@ static const struct option opts[] = {
 };
 
 static void
-init(struct xt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
 	struct ip6t_ipv6header_info *info = (struct ip6t_ipv6header_info *)m->data;
 
@@ -186,7 +186,6 @@ parse_header(const char *flags) {
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	struct ip6t_ipv6header_info *info = (struct ip6t_ipv6header_info *)(*match)->data;
diff --git a/extensions/libip6t_mh.c b/extensions/libip6t_mh.c
index d2f9cec..90d1204 100644
--- a/extensions/libip6t_mh.c
+++ b/extensions/libip6t_mh.c
@@ -67,7 +67,7 @@ IPTABLES_VERSION);
 	print_types_all();
 }
 
-static void init(struct xt_entry_match *m, unsigned int *nfcache)
+static void init(struct xt_entry_match *m)
 {
 	struct ip6t_mh *mhinfo = (struct ip6t_mh *)m->data;
 
@@ -127,7 +127,6 @@ static void parse_mh_types(const char *mhtype, u_int8_t *types)
 
 static int parse(int c, char **argv, int invert, unsigned int *flags,
 		 const void *entry,
-		 unsigned int *nfcache,
 		 struct xt_entry_match **match)
 {
 	struct ip6t_mh *mhinfo = (struct ip6t_mh *)(*match)->data;
diff --git a/extensions/libip6t_owner.c b/extensions/libip6t_owner.c
index a5ec8da..1f1c905 100644
--- a/extensions/libip6t_owner.c
+++ b/extensions/libip6t_owner.c
@@ -52,7 +52,6 @@ static const struct option opts[] = {
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	struct ip6t_owner_info *ownerinfo = (struct ip6t_owner_info *)(*match)->data;
diff --git a/extensions/libip6t_policy.c b/extensions/libip6t_policy.c
index 4612e14..d622724 100644
--- a/extensions/libip6t_policy.c
+++ b/extensions/libip6t_policy.c
@@ -133,9 +133,8 @@ extern void parse_hostnetworkmask(const char *name, struct in6_addr **addrpp,
 
 /* End duplicated code from ip6tables.c */
 
-static void init(struct xt_entry_match *m, unsigned int *nfcache)
+static void init(struct xt_entry_match *m)
 {
-	*nfcache |= NFC_UNKNOWN;
 }
 
 static int parse_direction(char *s)
@@ -167,7 +166,6 @@ static int parse_mode(char *s)
 
 static int parse(int c, char **argv, int invert, unsigned int *flags,
                  const void *entry,
-                 unsigned int *nfcache,
                  struct xt_entry_match **match)
 {
 	struct ip6t_policy_info *info = (void *)(*match)->data;
diff --git a/extensions/libip6t_rt.c b/extensions/libip6t_rt.c
index 3c3911e..a21fd68 100644
--- a/extensions/libip6t_rt.c
+++ b/extensions/libip6t_rt.c
@@ -139,7 +139,7 @@ parse_addresses(const char *addrstr, struct in6_addr *addrp)
 
 /* Initialize the match. */
 static void
-init(struct xt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
 	struct ip6t_rt *rtinfo = (struct ip6t_rt *)m->data;
 
@@ -157,7 +157,6 @@ init(struct xt_entry_match *m, unsigned int *nfcache)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	struct ip6t_rt *rtinfo = (struct ip6t_rt *)(*match)->data;
diff --git a/extensions/libip6t_state.c b/extensions/libip6t_state.c
index d7fc83c..9c43334 100644
--- a/extensions/libip6t_state.c
+++ b/extensions/libip6t_state.c
@@ -66,7 +66,6 @@ parse_states(const char *arg, struct ipt_state_info *sinfo)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	struct ipt_state_info *sinfo = (struct ipt_state_info *)(*match)->data;
diff --git a/extensions/libipt_CLUSTERIP.c b/extensions/libipt_CLUSTERIP.c
index aa2ad2c..afc7823 100644
--- a/extensions/libipt_CLUSTERIP.c
+++ b/extensions/libipt_CLUSTERIP.c
@@ -55,7 +55,7 @@ static const struct option opts[] = {
 };
 
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 }
 
diff --git a/extensions/libipt_ECN.c b/extensions/libipt_ECN.c
index 314531e..6cba361 100644
--- a/extensions/libipt_ECN.c
+++ b/extensions/libipt_ECN.c
@@ -17,7 +17,7 @@
 #include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter_ipv4/ipt_ECN.h>
 
-static void init(struct xt_entry_target *t, unsigned int *nfcache)
+static void init(struct xt_entry_target *t)
 {
 }
 
diff --git a/extensions/libipt_LOG.c b/extensions/libipt_LOG.c
index 4be14d5..c0d8177 100644
--- a/extensions/libipt_LOG.c
+++ b/extensions/libipt_LOG.c
@@ -44,7 +44,7 @@ static const struct option opts[] = {
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 	struct ipt_log_info *loginfo = (struct ipt_log_info *)t->data;
 
diff --git a/extensions/libipt_MASQUERADE.c b/extensions/libipt_MASQUERADE.c
index 07e93b3..36f2f24 100644
--- a/extensions/libipt_MASQUERADE.c
+++ b/extensions/libipt_MASQUERADE.c
@@ -31,7 +31,7 @@ static const struct option opts[] = {
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 	struct ip_nat_multi_range *mr = (struct ip_nat_multi_range *)t->data;
 
diff --git a/extensions/libipt_MIRROR.c b/extensions/libipt_MIRROR.c
index 2e3fb47..255f4c2 100644
--- a/extensions/libipt_MIRROR.c
+++ b/extensions/libipt_MIRROR.c
@@ -18,7 +18,7 @@ IPTABLES_VERSION);
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 }
 
diff --git a/extensions/libipt_NETMAP.c b/extensions/libipt_NETMAP.c
index ef06e01..06115ce 100644
--- a/extensions/libipt_NETMAP.c
+++ b/extensions/libipt_NETMAP.c
@@ -56,7 +56,7 @@ netmask2bits(u_int32_t netmask)
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 	struct ip_nat_multi_range *mr = (struct ip_nat_multi_range *)t->data;
 
diff --git a/extensions/libipt_REDIRECT.c b/extensions/libipt_REDIRECT.c
index 919fde5..3b6fe12 100644
--- a/extensions/libipt_REDIRECT.c
+++ b/extensions/libipt_REDIRECT.c
@@ -30,7 +30,7 @@ static const struct option opts[] = {
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 	struct ip_nat_multi_range *mr = (struct ip_nat_multi_range *)t->data;
 
diff --git a/extensions/libipt_REJECT.c b/extensions/libipt_REJECT.c
index 8aba561..4af3713 100644
--- a/extensions/libipt_REJECT.c
+++ b/extensions/libipt_REJECT.c
@@ -87,7 +87,7 @@ static const struct option opts[] = {
 
 /* Allocate and initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 	struct ipt_reject_info *reject = (struct ipt_reject_info *)t->data;
 
diff --git a/extensions/libipt_SAME.c b/extensions/libipt_SAME.c
index fe4df99..acfbdef 100644
--- a/extensions/libipt_SAME.c
+++ b/extensions/libipt_SAME.c
@@ -38,7 +38,7 @@ static const struct option opts[] = {
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 	struct ipt_same_info *mr = (struct ipt_same_info *)t->data;
 
diff --git a/extensions/libipt_SET.c b/extensions/libipt_SET.c
index 0425d20..0d96e45 100644
--- a/extensions/libipt_SET.c
+++ b/extensions/libipt_SET.c
@@ -41,7 +41,7 @@ static const struct option opts[] = {
 };
 
 /* Initialize the target. */
-static void init(struct xt_entry_target *target, unsigned int *nfcache)
+static void init(struct xt_entry_target *target)
 {
 	struct ipt_set_info_target *info =
 	    (struct ipt_set_info_target *) target->data;
diff --git a/extensions/libipt_TOS.c b/extensions/libipt_TOS.c
index d6b8c36..ba4c565 100644
--- a/extensions/libipt_TOS.c
+++ b/extensions/libipt_TOS.c
@@ -54,7 +54,7 @@ static const struct option opts[] = {
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 }
 
diff --git a/extensions/libipt_TTL.c b/extensions/libipt_TTL.c
index fa3205a..ed6b0fe 100644
--- a/extensions/libipt_TTL.c
+++ b/extensions/libipt_TTL.c
@@ -16,7 +16,7 @@
 
 #define IPT_TTL_USED	1
 
-static void init(struct xt_entry_target *t, unsigned int *nfcache)
+static void init(struct xt_entry_target *t)
 {
 }
 
diff --git a/extensions/libipt_ULOG.c b/extensions/libipt_ULOG.c
index cc65bba..84816a0 100644
--- a/extensions/libipt_ULOG.c
+++ b/extensions/libipt_ULOG.c
@@ -53,7 +53,7 @@ static const struct option opts[] = {
 };
 
 /* Initialize the target. */
-static void init(struct xt_entry_target *t, unsigned int *nfcache)
+static void init(struct xt_entry_target *t)
 {
 	struct ipt_ulog_info *loginfo = (struct ipt_ulog_info *) t->data;
 
diff --git a/extensions/libipt_addrtype.c b/extensions/libipt_addrtype.c
index f377e90..c3fd3c8 100644
--- a/extensions/libipt_addrtype.c
+++ b/extensions/libipt_addrtype.c
@@ -82,7 +82,7 @@ static void parse_types(const char *arg, u_int16_t *mask)
 #define IPT_ADDRTYPE_OPT_DSTTYPE	0x2
 
 static int parse(int c, char **argv, int invert, unsigned int *flags,
-		const void *entry, unsigned int *nfcache,
+		const void *entry,
 		struct xt_entry_match **match)
 {
 	struct ipt_addrtype_info *info =
diff --git a/extensions/libipt_ah.c b/extensions/libipt_ah.c
index feba38a..daf85bd 100644
--- a/extensions/libipt_ah.c
+++ b/extensions/libipt_ah.c
@@ -68,7 +68,7 @@ parse_ah_spis(const char *spistring, u_int32_t *spis)
 
 /* Initialize the match. */
 static void
-init(struct xt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
 	struct ipt_ah *ahinfo = (struct ipt_ah *)m->data;
 
@@ -82,7 +82,6 @@ init(struct xt_entry_match *m, unsigned int *nfcache)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	struct ipt_ah *ahinfo = (struct ipt_ah *)(*match)->data;
diff --git a/extensions/libipt_condition.c b/extensions/libipt_condition.c
index 30391d3..8ce9b53 100644
--- a/extensions/libipt_condition.c
+++ b/extensions/libipt_condition.c
@@ -26,7 +26,7 @@ static const struct option opts[] = {
 
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
-      const void *entry, unsigned int *nfcache,
+      const void *entry,
       struct xt_entry_match **match)
 {
 	struct condition_info *info =
diff --git a/extensions/libipt_connrate.c b/extensions/libipt_connrate.c
index a12cd8a..a469f05 100644
--- a/extensions/libipt_connrate.c
+++ b/extensions/libipt_connrate.c
@@ -77,7 +77,6 @@ parse_range(const char *arg, struct ipt_connrate_info *si)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	struct ipt_connrate_info *sinfo = (struct ipt_connrate_info *)(*match)->data;
diff --git a/extensions/libipt_conntrack.c b/extensions/libipt_conntrack.c
index d3999cf..8f74257 100644
--- a/extensions/libipt_conntrack.c
+++ b/extensions/libipt_conntrack.c
@@ -168,7 +168,6 @@ parse_expires(const char *s, struct ipt_conntrack_info *sinfo)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	struct ipt_conntrack_info *sinfo = (struct ipt_conntrack_info *)(*match)->data;
diff --git a/extensions/libipt_ecn.c b/extensions/libipt_ecn.c
index 538966f..d443e53 100644
--- a/extensions/libipt_ecn.c
+++ b/extensions/libipt_ecn.c
@@ -36,7 +36,6 @@ static const struct option opts[] = {
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	unsigned int result;
diff --git a/extensions/libipt_icmp.c b/extensions/libipt_icmp.c
index f46c004..9ee1baa 100644
--- a/extensions/libipt_icmp.c
+++ b/extensions/libipt_icmp.c
@@ -169,7 +169,7 @@ parse_icmp(const char *icmptype, u_int8_t *type, u_int8_t code[])
 
 /* Initialize the match. */
 static void
-init(struct xt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
 	struct ipt_icmp *icmpinfo = (struct ipt_icmp *)m->data;
 
@@ -182,7 +182,6 @@ init(struct xt_entry_match *m, unsigned int *nfcache)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	struct ipt_icmp *icmpinfo = (struct ipt_icmp *)(*match)->data;
diff --git a/extensions/libipt_iprange.c b/extensions/libipt_iprange.c
index 30696aa..3c2a014 100644
--- a/extensions/libipt_iprange.c
+++ b/extensions/libipt_iprange.c
@@ -57,7 +57,6 @@ parse_iprange(char *arg, struct ipt_iprange *range)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	struct ipt_iprange_info *info = (struct ipt_iprange_info *)(*match)->data;
diff --git a/extensions/libipt_owner.c b/extensions/libipt_owner.c
index 03f9b05..2c91041 100644
--- a/extensions/libipt_owner.c
+++ b/extensions/libipt_owner.c
@@ -54,7 +54,6 @@ static const struct option opts[] = {
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	struct ipt_owner_info *ownerinfo = (struct ipt_owner_info *)(*match)->data;
diff --git a/extensions/libipt_policy.c b/extensions/libipt_policy.c
index 97b7d02..6d6013d 100644
--- a/extensions/libipt_policy.c
+++ b/extensions/libipt_policy.c
@@ -93,9 +93,8 @@ static const struct option opts[] =
 	{ }
 };
 
-static void init(struct xt_entry_match *m, unsigned int *nfcache)
+static void init(struct xt_entry_match *m)
 {
-	*nfcache |= NFC_UNKNOWN;
 }
 
 static int parse_direction(char *s)
@@ -127,7 +126,6 @@ static int parse_mode(char *s)
 
 static int parse(int c, char **argv, int invert, unsigned int *flags,
                  const void *entry,
-                 unsigned int *nfcache,
                  struct xt_entry_match **match)
 {
 	struct ipt_policy_info *info = (void *)(*match)->data;
diff --git a/extensions/libipt_realm.c b/extensions/libipt_realm.c
index 0b11457..86f7125 100644
--- a/extensions/libipt_realm.c
+++ b/extensions/libipt_realm.c
@@ -157,7 +157,6 @@ const char* realm_id2name(int id)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	struct ipt_realm_info *realminfo = (struct ipt_realm_info *)(*match)->data;
diff --git a/extensions/libipt_recent.c b/extensions/libipt_recent.c
index 94721b3..cad0120 100644
--- a/extensions/libipt_recent.c
+++ b/extensions/libipt_recent.c
@@ -68,7 +68,7 @@ IPTABLES_VERSION);
   
 /* Initialize the match. */
 static void
-init(struct xt_entry_match *match, unsigned int *nfcache)
+init(struct xt_entry_match *match)
 {
 	struct ipt_recent_info *info = (struct ipt_recent_info *)(match)->data;
 
@@ -85,7 +85,6 @@ init(struct xt_entry_match *match, unsigned int *nfcache)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	struct ipt_recent_info *info = (struct ipt_recent_info *)(*match)->data;
diff --git a/extensions/libipt_set.c b/extensions/libipt_set.c
index d5cc1c3..e2804b0 100644
--- a/extensions/libipt_set.c
+++ b/extensions/libipt_set.c
@@ -38,7 +38,7 @@ static const struct option opts[] = {
 };
 
 /* Initialize the match. */
-static void init(struct xt_entry_match *match, unsigned int *nfcache)
+static void init(struct xt_entry_match *match)
 {
 	struct ipt_set_info_match *info = 
 		(struct ipt_set_info_match *) match->data;
@@ -52,7 +52,7 @@ static void init(struct xt_entry_match *match, unsigned int *nfcache)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache, struct xt_entry_match **match)
+      struct xt_entry_match **match)
 {
 	struct ipt_set_info_match *myinfo = 
 		(struct ipt_set_info_match *) (*match)->data;
diff --git a/extensions/libipt_tos.c b/extensions/libipt_tos.c
index 2f5f915..66489a9 100644
--- a/extensions/libipt_tos.c
+++ b/extensions/libipt_tos.c
@@ -77,7 +77,6 @@ parse_tos(const char *s, struct ipt_tos_info *info)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	struct ipt_tos_info *tosinfo = (struct ipt_tos_info *)(*match)->data;
diff --git a/extensions/libipt_ttl.c b/extensions/libipt_ttl.c
index f5602f5..4b241f5 100644
--- a/extensions/libipt_ttl.c
+++ b/extensions/libipt_ttl.c
@@ -25,7 +25,7 @@ static void help(void)
 }
 
 static int parse(int c, char **argv, int invert, unsigned int *flags,
-		const void *entry, unsigned int *nfcache,
+		const void *entry,
 		struct xt_entry_match **match)
 {
 	struct ipt_ttl_info *info = (struct ipt_ttl_info *) (*match)->data;
diff --git a/extensions/libipt_unclean.c b/extensions/libipt_unclean.c
index 4ac4191..9f7712a 100644
--- a/extensions/libipt_unclean.c
+++ b/extensions/libipt_unclean.c
@@ -18,7 +18,6 @@ help(void)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	return 0;
diff --git a/extensions/libxt_CLASSIFY.c b/extensions/libxt_CLASSIFY.c
index acebd92..6d637c7 100644
--- a/extensions/libxt_CLASSIFY.c
+++ b/extensions/libxt_CLASSIFY.c
@@ -28,7 +28,7 @@ static const struct option opts[] = {
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 }
 
diff --git a/extensions/libxt_CONNMARK.c b/extensions/libxt_CONNMARK.c
index 785f40b..3680323 100644
--- a/extensions/libxt_CONNMARK.c
+++ b/extensions/libxt_CONNMARK.c
@@ -58,7 +58,7 @@ static const struct option opts[] = {
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 }
 
diff --git a/extensions/libxt_DSCP.c b/extensions/libxt_DSCP.c
index b062c63..b42d99d 100644
--- a/extensions/libxt_DSCP.c
+++ b/extensions/libxt_DSCP.c
@@ -22,7 +22,7 @@
 #include "libipt_dscp_helper.c"
 
 
-static void init(struct xt_entry_target *t, unsigned int *nfcache)
+static void init(struct xt_entry_target *t)
 {
 }
 
diff --git a/extensions/libxt_MARK.c b/extensions/libxt_MARK.c
index ff73767..3ab767d 100644
--- a/extensions/libxt_MARK.c
+++ b/extensions/libxt_MARK.c
@@ -30,7 +30,7 @@ static const struct option opts[] = {
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 }
 
diff --git a/extensions/libxt_NFLOG.c b/extensions/libxt_NFLOG.c
index 9c5ea09..b42f801 100644
--- a/extensions/libxt_NFLOG.c
+++ b/extensions/libxt_NFLOG.c
@@ -32,7 +32,7 @@ static void help(void)
 	       IPTABLES_VERSION);
 }
 
-static void init(struct xt_entry_target *t, unsigned int *nfcache)
+static void init(struct xt_entry_target *t)
 {
 	struct xt_nflog_info *info = (struct xt_nflog_info *)t->data;
 
diff --git a/extensions/libxt_NFQUEUE.c b/extensions/libxt_NFQUEUE.c
index c5e7325..10aa152 100644
--- a/extensions/libxt_NFQUEUE.c
+++ b/extensions/libxt_NFQUEUE.c
@@ -14,7 +14,7 @@
 #include <linux/netfilter/x_tables.h>
 #include <linux/netfilter/xt_NFQUEUE.h>
 
-static void init(struct xt_entry_target *t, unsigned int *nfcache)
+static void init(struct xt_entry_target *t)
 {
 }
 
diff --git a/extensions/libxt_NOTRACK.c b/extensions/libxt_NOTRACK.c
index 370ff21..4973303 100644
--- a/extensions/libxt_NOTRACK.c
+++ b/extensions/libxt_NOTRACK.c
@@ -18,7 +18,7 @@ IPTABLES_VERSION);
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 }
 
diff --git a/extensions/libxt_SECMARK.c b/extensions/libxt_SECMARK.c
index 11a617b..d0c21a9 100644
--- a/extensions/libxt_SECMARK.c
+++ b/extensions/libxt_SECMARK.c
@@ -29,7 +29,7 @@ static const struct option opts[] = {
 };
 
 /* Initialize the target. */
-static void init(struct xt_entry_target *t, unsigned int *nfcache)
+static void init(struct xt_entry_target *t)
 { }
 
 /*
diff --git a/extensions/libxt_TCPMSS.c b/extensions/libxt_TCPMSS.c
index 12b4cb6..a779b93 100644
--- a/extensions/libxt_TCPMSS.c
+++ b/extensions/libxt_TCPMSS.c
@@ -44,7 +44,7 @@ static const struct option opts[] = {
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 }
 
diff --git a/extensions/libxt_TRACE.c b/extensions/libxt_TRACE.c
index 8319b32..e6761f0 100644
--- a/extensions/libxt_TRACE.c
+++ b/extensions/libxt_TRACE.c
@@ -18,7 +18,7 @@ IPTABLES_VERSION);
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 }
 
diff --git a/extensions/libxt_comment.c b/extensions/libxt_comment.c
index db45ab6..1a82f00 100644
--- a/extensions/libxt_comment.c
+++ b/extensions/libxt_comment.c
@@ -46,7 +46,6 @@ parse_comment(const char *s, struct xt_comment_info *info)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	struct xt_comment_info *commentinfo = (struct xt_comment_info *)(*match)->data;
diff --git a/extensions/libxt_connbytes.c b/extensions/libxt_connbytes.c
index 48ef9a3..1a3cf6e 100644
--- a/extensions/libxt_connbytes.c
+++ b/extensions/libxt_connbytes.c
@@ -50,7 +50,6 @@ parse_range(const char *arg, struct xt_connbytes_info *si)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	struct xt_connbytes_info *sinfo = (struct xt_connbytes_info *)(*match)->data;
diff --git a/extensions/libxt_connlimit.c b/extensions/libxt_connlimit.c
index 28a9caa..58faa11 100644
--- a/extensions/libxt_connlimit.c
+++ b/extensions/libxt_connlimit.c
@@ -24,7 +24,7 @@ static const struct option connlimit_opts[] = {
 	{NULL},
 };
 
-static void connlimit_init(struct ipt_entry_match *match, unsigned int *nfc)
+static void connlimit_init(struct ipt_entry_match *match)
 {
 	struct xt_connlimit_info *info = (void *)match->data;
 	info->v4_mask = 0xFFFFFFFFUL;
@@ -101,7 +101,6 @@ static int connlimit_parse(int c, char **argv, int invert, unsigned int *flags,
 
 static int connlimit_parse4(int c, char **argv, int invert,
                             unsigned int *flags, const void *entry,
-                            unsigned int *nfcache,
                             struct xt_entry_match **match)
 {
 	return connlimit_parse(c, argv, invert, flags,
@@ -110,7 +109,6 @@ static int connlimit_parse4(int c, char **argv, int invert,
 
 static int connlimit_parse6(int c, char **argv, int invert,
                             unsigned int *flags, const void *entry,
-                            unsigned int *nfcache,
                             struct xt_entry_match **match)
 {
 	return connlimit_parse(c, argv, invert, flags,
diff --git a/extensions/libxt_connmark.c b/extensions/libxt_connmark.c
index 2ed9a91..64f6c75 100644
--- a/extensions/libxt_connmark.c
+++ b/extensions/libxt_connmark.c
@@ -49,7 +49,6 @@ static const struct option opts[] = {
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	struct xt_connmark_info *markinfo = (struct xt_connmark_info *)(*match)->data;
diff --git a/extensions/libxt_dccp.c b/extensions/libxt_dccp.c
index 45c7e38..02b84f1 100644
--- a/extensions/libxt_dccp.c
+++ b/extensions/libxt_dccp.c
@@ -26,8 +26,7 @@
 
 /* Initialize the match. */
 static void
-init(struct xt_entry_match *m,
-     unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
 	struct xt_dccp_info *einfo = (struct xt_dccp_info *)m->data;
 
@@ -135,7 +134,6 @@ static u_int8_t parse_dccp_option(char *optstring)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	struct xt_dccp_info *einfo
diff --git a/extensions/libxt_dscp.c b/extensions/libxt_dscp.c
index e2de940..7e0c3e4 100644
--- a/extensions/libxt_dscp.c
+++ b/extensions/libxt_dscp.c
@@ -76,7 +76,6 @@ parse_class(const char *s, struct xt_dscp_info *dinfo)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	struct xt_dscp_info *dinfo
diff --git a/extensions/libxt_esp.c b/extensions/libxt_esp.c
index 6836dfc..8811d66 100644
--- a/extensions/libxt_esp.c
+++ b/extensions/libxt_esp.c
@@ -71,7 +71,7 @@ parse_esp_spis(const char *spistring, u_int32_t *spis)
 
 /* Initialize the match. */
 static void
-init(struct xt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
 	struct xt_esp *espinfo = (struct xt_esp *)m->data;
 
@@ -85,7 +85,6 @@ init(struct xt_entry_match *m, unsigned int *nfcache)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	struct xt_esp *espinfo = (struct xt_esp *)(*match)->data;
diff --git a/extensions/libxt_hashlimit.c b/extensions/libxt_hashlimit.c
index b47c432..e845a9c 100644
--- a/extensions/libxt_hashlimit.c
+++ b/extensions/libxt_hashlimit.c
@@ -96,7 +96,7 @@ int parse_rate(const char *rate, u_int32_t *val)
 
 /* Initialize the match. */
 static void
-init(struct xt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
 	struct xt_hashlimit_info *r = (struct xt_hashlimit_info *)m->data;
 
@@ -152,7 +152,6 @@ static int parse_mode(struct xt_hashlimit_info *r, char *optarg)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	struct xt_hashlimit_info *r = 
diff --git a/extensions/libxt_helper.c b/extensions/libxt_helper.c
index ca3cb21..bce0f28 100644
--- a/extensions/libxt_helper.c
+++ b/extensions/libxt_helper.c
@@ -29,7 +29,6 @@ static const struct option opts[] = {
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	struct xt_helper_info *info = (struct xt_helper_info *)(*match)->data;
diff --git a/extensions/libxt_length.c b/extensions/libxt_length.c
index 46a4ad2..79e6f41 100644
--- a/extensions/libxt_length.c
+++ b/extensions/libxt_length.c
@@ -67,7 +67,6 @@ parse_lengths(const char *s, struct xt_length_info *info)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	struct xt_length_info *info = (struct xt_length_info *)(*match)->data;
diff --git a/extensions/libxt_limit.c b/extensions/libxt_limit.c
index f8c9e64..c1db72a 100644
--- a/extensions/libxt_limit.c
+++ b/extensions/libxt_limit.c
@@ -74,7 +74,7 @@ int parse_rate(const char *rate, u_int32_t *val)
 
 /* Initialize the match. */
 static void
-init(struct xt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
 	struct xt_rateinfo *r = (struct xt_rateinfo *)m->data;
 
@@ -94,7 +94,6 @@ init(struct xt_entry_match *m, unsigned int *nfcache)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	struct xt_rateinfo *r = (struct xt_rateinfo *)(*match)->data;
diff --git a/extensions/libxt_mac.c b/extensions/libxt_mac.c
index b935ea5..a9874cd 100644
--- a/extensions/libxt_mac.c
+++ b/extensions/libxt_mac.c
@@ -57,7 +57,6 @@ parse_mac(const char *mac, struct xt_mac_info *info)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	struct xt_mac_info *macinfo = (struct xt_mac_info *)(*match)->data;
diff --git a/extensions/libxt_mark.c b/extensions/libxt_mark.c
index 23643dc..7edaf2e 100644
--- a/extensions/libxt_mark.c
+++ b/extensions/libxt_mark.c
@@ -30,7 +30,6 @@ static const struct option opts[] = {
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	struct xt_mark_info *markinfo = (struct xt_mark_info *)(*match)->data;
diff --git a/extensions/libxt_multiport.c b/extensions/libxt_multiport.c
index f7e67da..25aa628 100644
--- a/extensions/libxt_multiport.c
+++ b/extensions/libxt_multiport.c
@@ -135,7 +135,7 @@ parse_multi_ports_v1(const char *portstring,
 
 /* Initialize the match. */
 static void
-init(struct xt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
 }
 
@@ -213,7 +213,6 @@ __parse(int c, char **argv, int invert, unsigned int *flags,
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
 	 const void *e,
-	 unsigned int *nfcache,
 	 struct xt_entry_match **match)
 {
 	const struct ipt_entry *entry = e;
@@ -224,7 +223,6 @@ parse(int c, char **argv, int invert, unsigned int *flags,
 static int
 parse6(int c, char **argv, int invert, unsigned int *flags,
 	 const void *e,
-	 unsigned int *nfcache,
 	 struct xt_entry_match **match)
 {
 	const struct ip6t_entry *entry = (const struct ip6t_entry *)e;
@@ -280,7 +278,6 @@ __parse_v1(int c, char **argv, int invert, unsigned int *flags,
 static int
 parse_v1(int c, char **argv, int invert, unsigned int *flags,
 	 const void *e,
-	 unsigned int *nfcache,
 	 struct xt_entry_match **match)
 {
 	const struct ipt_entry *entry = e;
@@ -291,7 +288,6 @@ parse_v1(int c, char **argv, int invert, unsigned int *flags,
 static int
 parse6_v1(int c, char **argv, int invert, unsigned int *flags,
 	  const void *e,
-	  unsigned int *nfcache,
 	  struct xt_entry_match **match)
 {
 	const struct ip6t_entry *entry = (const struct ip6t_entry *)e;
diff --git a/extensions/libxt_physdev.c b/extensions/libxt_physdev.c
index 5517472..ed58501 100644
--- a/extensions/libxt_physdev.c
+++ b/extensions/libxt_physdev.c
@@ -35,14 +35,13 @@ static const struct option opts[] = {
 };
 
 static void
-init(struct xt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
 }
 
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	struct xt_physdev_info *info =
diff --git a/extensions/libxt_pkttype.c b/extensions/libxt_pkttype.c
index 3732034..85e43ea 100644
--- a/extensions/libxt_pkttype.c
+++ b/extensions/libxt_pkttype.c
@@ -87,7 +87,6 @@ static void parse_pkttype(const char *pkttype, struct xt_pkttype_info *info)
 
 static int parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	struct xt_pkttype_info *info = (struct xt_pkttype_info *)(*match)->data;
diff --git a/extensions/libxt_quota.c b/extensions/libxt_quota.c
index ab4fb96..1d3ef63 100644
--- a/extensions/libxt_quota.c
+++ b/extensions/libxt_quota.c
@@ -60,7 +60,7 @@ parse_quota(const char *s, u_int64_t * quota)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache, struct xt_entry_match **match)
+      struct xt_entry_match **match)
 {
         struct xt_quota_info *info = (struct xt_quota_info *) (*match)->data;
 
diff --git a/extensions/libxt_sctp.c b/extensions/libxt_sctp.c
index 734e706..39553bf 100644
--- a/extensions/libxt_sctp.c
+++ b/extensions/libxt_sctp.c
@@ -42,8 +42,7 @@ print_chunk(u_int32_t chunknum, int numeric);
 
 /* Initialize the match. */
 static void
-init(struct xt_entry_match *m,
-     unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
 	int i;
 	struct xt_sctp_info *einfo = (struct xt_sctp_info *)m->data;
@@ -263,7 +262,6 @@ parse_sctp_chunks(struct xt_sctp_info *einfo,
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	struct xt_sctp_info *einfo
diff --git a/extensions/libxt_standard.c b/extensions/libxt_standard.c
index 9aafb6c..ccdb599 100644
--- a/extensions/libxt_standard.c
+++ b/extensions/libxt_standard.c
@@ -18,7 +18,7 @@ help(void)
 
 /* Initialize the target. */
 static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 }
 
diff --git a/extensions/libxt_state.c b/extensions/libxt_state.c
index 3972a3b..8d193fa 100644
--- a/extensions/libxt_state.c
+++ b/extensions/libxt_state.c
@@ -66,7 +66,6 @@ parse_states(const char *arg, struct xt_state_info *sinfo)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	struct xt_state_info *sinfo = (struct xt_state_info *)(*match)->data;
diff --git a/extensions/libxt_statistic.c b/extensions/libxt_statistic.c
index 6f88c45..d2210fa 100644
--- a/extensions/libxt_statistic.c
+++ b/extensions/libxt_statistic.c
@@ -36,7 +36,6 @@ static struct xt_statistic_info *info;
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	double prob;
diff --git a/extensions/libxt_string.c b/extensions/libxt_string.c
index ea0a2aa..698504d 100644
--- a/extensions/libxt_string.c
+++ b/extensions/libxt_string.c
@@ -54,7 +54,7 @@ static const struct option opts[] = {
 };
 
 static void
-init(struct xt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
 	struct xt_string_info *i = (struct xt_string_info *) m->data;
 
@@ -171,7 +171,6 @@ parse_hex_string(const char *s, struct xt_string_info *info)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	struct xt_string_info *stringinfo = (struct xt_string_info *)(*match)->data;
diff --git a/extensions/libxt_tcp.c b/extensions/libxt_tcp.c
index e5db637..2c1a21a 100644
--- a/extensions/libxt_tcp.c
+++ b/extensions/libxt_tcp.c
@@ -131,7 +131,7 @@ parse_tcp_option(const char *option, u_int8_t *result)
 
 /* Initialize the match. */
 static void
-init(struct xt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
 	struct xt_tcp *tcpinfo = (struct xt_tcp *)m->data;
 
@@ -148,7 +148,6 @@ init(struct xt_entry_match *m, unsigned int *nfcache)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	struct xt_tcp *tcpinfo = (struct xt_tcp *)(*match)->data;
diff --git a/extensions/libxt_tcpmss.c b/extensions/libxt_tcpmss.c
index 817578a..df56879 100644
--- a/extensions/libxt_tcpmss.c
+++ b/extensions/libxt_tcpmss.c
@@ -61,7 +61,6 @@ parse_tcp_mssvalues(const char *mssvaluestring,
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	struct xt_tcpmss_match_info *mssinfo =
diff --git a/extensions/libxt_udp.c b/extensions/libxt_udp.c
index 81ff314..dcfa48d 100644
--- a/extensions/libxt_udp.c
+++ b/extensions/libxt_udp.c
@@ -55,7 +55,7 @@ parse_udp_ports(const char *portstring, u_int16_t *ports)
 
 /* Initialize the match. */
 static void
-init(struct xt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
 	struct xt_udp *udpinfo = (struct xt_udp *)m->data;
 
@@ -70,7 +70,6 @@ init(struct xt_entry_match *m, unsigned int *nfcache)
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      unsigned int *nfcache,
       struct xt_entry_match **match)
 {
 	struct xt_udp *udpinfo = (struct xt_udp *)(*match)->data;
diff --git a/include/xtables.h b/include/xtables.h
index 3ac561f..f23c303 100644
--- a/include/xtables.h
+++ b/include/xtables.h
@@ -80,14 +80,13 @@ struct xtables_match
 	void (*help)(void);
 
 	/* Initialize the match. */
-	void (*init)(struct xt_entry_match *m, unsigned int *nfcache);
+	void (*init)(struct xt_entry_match *m);
 
 	/* Function which parses command options; returns true if it
            ate an option */
 	/* entry is struct ipt_entry for example */
 	int (*parse)(int c, char **argv, int invert, unsigned int *flags,
 		     const void *entry,
-		     unsigned int *nfcache,
 		     struct xt_entry_match **match);
 
 	/* Final check; exit if not ok. */
@@ -137,7 +136,7 @@ struct xtables_target
 	void (*help)(void);
 
 	/* Initialize the target. */
-	void (*init)(struct xt_entry_target *t, unsigned int *nfcache);
+	void (*init)(struct xt_entry_target *t);
 
 	/* Function which parses command options; returns true if it
            ate an option */
diff --git a/ip6tables.c b/ip6tables.c
index aeebed4..79c31bb 100644
--- a/ip6tables.c
+++ b/ip6tables.c
@@ -1627,7 +1627,7 @@ int do_command6(int argc, char *argv[], char **table, ip6tc_handle_t *handle)
 				target->t->u.target_size = size;
 				strcpy(target->t->u.user.name, jumpto);
 				if (target->init != NULL)
-					target->init(target->t, &fw.nfcache);
+					target->init(target->t);
 				opts = merge_options(opts, target->extra_opts, &target->option_offset);
 			}
 			break;
@@ -1673,7 +1673,7 @@ int do_command6(int argc, char *argv[], char **table, ip6tc_handle_t *handle)
 			strcpy(m->m->u.user.name, m->name);
 			set_revision(m->m->u.user.name, m->revision);
 			if (m->init != NULL)
-				m->init(m->m, &fw.nfcache);
+				m->init(m->m);
 			if (m != m->next)
 				/* Merge options for non-cloned matches */
 				opts = merge_options(opts, m->extra_opts, &m->option_offset);
@@ -1766,7 +1766,6 @@ int do_command6(int argc, char *argv[], char **table, ip6tc_handle_t *handle)
 						     argv, invert,
 						     &matchp->match->mflags,
 						     &fw,
-						     &fw.nfcache,
 						     &matchp->match->m))
 						break;
 				}
@@ -1819,7 +1818,7 @@ int do_command6(int argc, char *argv[], char **table, ip6tc_handle_t *handle)
 					set_revision(m->m->u.user.name,
 						     m->revision);
 					if (m->init != NULL)
-						m->init(m->m, &fw.nfcache);
+						m->init(m->m);
 
 					opts = merge_options(opts,
 					    m->extra_opts, &m->option_offset);
@@ -1948,7 +1947,7 @@ int do_command6(int argc, char *argv[], char **table, ip6tc_handle_t *handle)
 			target->t->u.target_size = size;
 			strcpy(target->t->u.user.name, jumpto);
 			if (target->init != NULL)
-				target->init(target->t, &fw.nfcache);
+				target->init(target->t);
 		}
 
 		if (!target) {
diff --git a/iptables.c b/iptables.c
index f77a6f0..344d2d6 100644
--- a/iptables.c
+++ b/iptables.c
@@ -1687,7 +1687,7 @@ int do_command(int argc, char *argv[], char **table, iptc_handle_t *handle)
 				set_revision(target->t->u.user.name,
 					     target->revision);
 				if (target->init != NULL)
-					target->init(target->t, &fw.nfcache);
+					target->init(target->t);
 				opts = merge_options(opts, target->extra_opts, &target->option_offset);
 			}
 			break;
@@ -1739,7 +1739,7 @@ int do_command(int argc, char *argv[], char **table, iptc_handle_t *handle)
 			strcpy(m->m->u.user.name, m->name);
 			set_revision(m->m->u.user.name, m->revision);
 			if (m->init != NULL)
-				m->init(m->m, &fw.nfcache);
+				m->init(m->m);
 			if (m != m->next)
 				/* Merge options for non-cloned matches */
 				opts = merge_options(opts, m->extra_opts, &m->option_offset);
@@ -1832,7 +1832,6 @@ int do_command(int argc, char *argv[], char **table, iptc_handle_t *handle)
 						     argv, invert,
 						     &matchp->match->mflags,
 						     &fw,
-						     &fw.nfcache,
 						     &matchp->match->m))
 						break;
 				}
@@ -1885,7 +1884,7 @@ int do_command(int argc, char *argv[], char **table, iptc_handle_t *handle)
 					set_revision(m->m->u.user.name,
 						     m->revision);
 					if (m->init != NULL)
-						m->init(m->m, &fw.nfcache);
+						m->init(m->m);
 
 					opts = merge_options(opts,
 					    m->extra_opts, &m->option_offset);
@@ -2016,7 +2015,7 @@ int do_command(int argc, char *argv[], char **table, iptc_handle_t *handle)
 				set_revision(target->t->u.user.name,
 					     target->revision);
 			if (target->init != NULL)
-				target->init(target->t, &fw.nfcache);
+				target->init(target->t);
 		}
 
 		if (!target) {
diff --git a/libiptc/libip4tc.c b/libiptc/libip4tc.c
index a0cdc2f..71af17f 100644
--- a/libiptc/libip4tc.c
+++ b/libiptc/libip4tc.c
@@ -148,10 +148,7 @@ dump_entry(STRUCT_ENTRY *e, const TC_HANDLE_T handle)
 	printf("Invflags: %02X\n", e->ip.invflags);
 	printf("Counters: %llu packets, %llu bytes\n",
 	       (unsigned long long)e->counters.pcnt, (unsigned long long)e->counters.bcnt);
-	printf("Cache: %08X ", e->nfcache);
-	if (e->nfcache & NFC_ALTERED) printf("ALTERED ");
-	if (e->nfcache & NFC_UNKNOWN) printf("UNKNOWN ");
-	printf("\n");
+	printf("Cache: %08X\n", e->nfcache);
 
 	IPT_MATCH_ITERATE(e, print_match);
 
@@ -204,8 +201,7 @@ is_same(const STRUCT_ENTRY *a, const STRUCT_ENTRY *b, unsigned char *matchmask)
 			return NULL;
 	}
 
-	if (a->nfcache != b->nfcache
-	    || a->target_offset != b->target_offset
+	if (a->target_offset != b->target_offset
 	    || a->next_offset != b->next_offset)
 		return NULL;
 
diff --git a/libiptc/libip6tc.c b/libiptc/libip6tc.c
index 5b3ae0b..effbd44 100644
--- a/libiptc/libip6tc.c
+++ b/libiptc/libip6tc.c
@@ -179,10 +179,7 @@ dump_entry(struct ip6t_entry *e, const ip6tc_handle_t handle)
 	printf("Invflags: %02X\n", e->ipv6.invflags);
 	printf("Counters: %llu packets, %llu bytes\n",
 	       (unsigned long long)e->counters.pcnt, (unsigned long long)e->counters.bcnt);
-	printf("Cache: %08X ", e->nfcache);
-	if (e->nfcache & NFC_ALTERED) printf("ALTERED ");
-	if (e->nfcache & NFC_UNKNOWN) printf("UNKNOWN ");
-	printf("\n");
+	printf("Cache: %08X\n", e->nfcache);
 	
 	IP6T_MATCH_ITERATE(e, print_match);
 
@@ -236,8 +233,7 @@ is_same(const STRUCT_ENTRY *a, const STRUCT_ENTRY *b,
 			return NULL;
 	}
 
-	if (a->nfcache != b->nfcache
-	    || a->target_offset != b->target_offset
+	if (a->target_offset != b->target_offset
 	    || a->next_offset != b->next_offset)
 		return NULL;
 
-- 
cgit v1.2.3