netfilter: remove xt pernet data

clusterip is now handled via net_generic.

NOTRACK is tiny compared to rest of xt_CT feature set, even the existing
deprecation warning is bigger than the actual functionality.

Just remove the warning, its not worth keeping/adding a net_generic one.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index cc54750..bb5fa59 100644 (file)
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -23,7 +23,6 @@
 #include <net/netns/ieee802154_6lowpan.h>
 #include <net/netns/sctp.h>
 #include <net/netns/netfilter.h>
-#include <net/netns/x_tables.h>
 #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
 #include <net/netns/conntrack.h>
 #endif
@@ -133,7 +132,6 @@ struct net {
 #endif
 #ifdef CONFIG_NETFILTER
        struct netns_nf         nf;
-       struct netns_xt         xt;
 #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
        struct netns_ct         ct;
 #endif

diff --git a/include/net/netns/x_tables.h b/include/net/netns/x_tables.h
deleted file mode 100644 (file)
index d02316e..0000000
--- a/include/net/netns/x_tables.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef __NETNS_X_TABLES_H
-#define __NETNS_X_TABLES_H
-
-#include <linux/list.h>
-#include <linux/netfilter_defs.h>
-
-struct netns_xt {
-       bool notrack_deprecated_warning;
-       bool clusterip_deprecated_warning;
-};
-#endif

diff --git a/net/netfilter/xt_CT.c b/net/netfilter/xt_CT.c
index 12404d2..0a913ce 100644 (file)
--- a/net/netfilter/xt_CT.c
+++ b/net/netfilter/xt_CT.c
@@ -351,21 +351,10 @@ notrack_tg(struct sk_buff *skb, const struct xt_action_param *par)
        return XT_CONTINUE;
 }
 
-static int notrack_chk(const struct xt_tgchk_param *par)
-{
-       if (!par->net->xt.notrack_deprecated_warning) {
-               pr_info("netfilter: NOTRACK target is deprecated, "
-                       "use CT instead or upgrade iptables\n");
-               par->net->xt.notrack_deprecated_warning = true;
-       }
-       return 0;
-}
-
 static struct xt_target notrack_tg_reg __read_mostly = {
        .name           = "NOTRACK",
        .revision       = 0,
        .family         = NFPROTO_UNSPEC,
-       .checkentry     = notrack_chk,
        .target         = notrack_tg,
        .table          = "raw",
        .me             = THIS_MODULE,