aleph/lkl_linux
1
0
Fork 0
mirror of https://github.com/lkl/linux.git synced 2025-12-19 16:13:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

netfilter: remove xt pernet data

Browse Source 
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>
This commit is contained in:
Florian Westphal
2021-07-22 10:48:34 +02:00
committed by Pablo Neira Ayuso
parent ded2d10e9a
commit f2e3778db7
3 changed files with 0 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/net_namespace.h
View File

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

12
include/net/netns/x_tables.h
View File

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

11
net/netfilter/xt_CT.c
View File

@@ -351,21 +351,10 @@ notrack_tg(struct sk_buff *skb, const struct xt_action_param *par)
return XT_CONTINUE; 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 = { static struct xt_target notrack_tg_reg __read_mostly = {
.name = "NOTRACK", .name = "NOTRACK",
.revision = 0, .revision = 0,
.family = NFPROTO_UNSPEC, .family = NFPROTO_UNSPEC,
.checkentry = notrack_chk,
.target = notrack_tg, .target = notrack_tg,
.table = "raw", .table = "raw",
.me = THIS_MODULE, .me = THIS_MODULE,