Commit 48dc7865 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Patrick McHardy
Browse files

netfilter: netns: remove nf_*_net() wrappers 



Now that dev_net() exists, the usefullness of them is even less. Also they're
a big problem in resolving circular header dependencies necessary for
NOTRACK-in-netns patch. See below.

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 55b69e91

include/linux/netfilter.h

+0 −53
Original line number Diff line number Diff line
@@ -5,13 +5,11 @@ 
#include <linux/init.h>

#include <linux/skbuff.h>

#include <linux/net.h>

#include <linux/netdevice.h>

#include <linux/if.h>

#include <linux/in.h>

#include <linux/in6.h>

#include <linux/wait.h>

#include <linux/list.h>

#include <net/net_namespace.h>

#endif

#include <linux/types.h>

#include <linux/compiler.h>
@@ -355,56 +353,5 @@ extern void (*nf_ct_destroy)(struct nf_conntrack *); 
static inline void nf_ct_attach(struct sk_buff *new, struct sk_buff *skb) {}

#endif



static inline struct net *nf_pre_routing_net(const struct net_device *in,

					     const struct net_device *out)

{

#ifdef CONFIG_NET_NS

	return in->nd_net;

#else

	return &init_net;

#endif

}



static inline struct net *nf_local_in_net(const struct net_device *in,

					  const struct net_device *out)

{

#ifdef CONFIG_NET_NS

	return in->nd_net;

#else

	return &init_net;

#endif

}



static inline struct net *nf_forward_net(const struct net_device *in,

					 const struct net_device *out)

{

#ifdef CONFIG_NET_NS

	BUG_ON(in->nd_net != out->nd_net);

	return in->nd_net;

#else

	return &init_net;

#endif

}



static inline struct net *nf_local_out_net(const struct net_device *in,

					   const struct net_device *out)

{

#ifdef CONFIG_NET_NS

	return out->nd_net;

#else

	return &init_net;

#endif

}



static inline struct net *nf_post_routing_net(const struct net_device *in,

					      const struct net_device *out)

{

#ifdef CONFIG_NET_NS

	return out->nd_net;

#else

	return &init_net;

#endif

}



#endif /*__KERNEL__*/

#endif /*__LINUX_NETFILTER_H*/

net/ipv4/netfilter/iptable_filter.c

+3 −3
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ ipt_local_in_hook(unsigned int hook, 
		  int (*okfn)(struct sk_buff *))

{

	return ipt_do_table(skb, hook, in, out,

			    nf_local_in_net(in, out)->ipv4.iptable_filter);

			    dev_net(in)->ipv4.iptable_filter);

}



static unsigned int
@@ -81,7 +81,7 @@ ipt_hook(unsigned int hook, 
	 int (*okfn)(struct sk_buff *))

{

	return ipt_do_table(skb, hook, in, out,

			    nf_forward_net(in, out)->ipv4.iptable_filter);

			    dev_net(in)->ipv4.iptable_filter);

}



static unsigned int
@@ -101,7 +101,7 @@ ipt_local_out_hook(unsigned int hook, 
	}



	return ipt_do_table(skb, hook, in, out,

			    nf_local_out_net(in, out)->ipv4.iptable_filter);

			    dev_net(out)->ipv4.iptable_filter);

}



static struct nf_hook_ops ipt_ops[] __read_mostly = {

net/ipv4/netfilter/iptable_mangle.c

+5 −5
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ ipt_pre_routing_hook(unsigned int hook, 
		     int (*okfn)(struct sk_buff *))

{

	return ipt_do_table(skb, hook, in, out,

			    nf_pre_routing_net(in, out)->ipv4.iptable_mangle);

			    dev_net(in)->ipv4.iptable_mangle);

}



static unsigned int
@@ -92,7 +92,7 @@ ipt_post_routing_hook(unsigned int hook, 
		      int (*okfn)(struct sk_buff *))

{

	return ipt_do_table(skb, hook, in, out,

			    nf_post_routing_net(in, out)->ipv4.iptable_mangle);

			    dev_net(out)->ipv4.iptable_mangle);

}



static unsigned int
@@ -103,7 +103,7 @@ ipt_local_in_hook(unsigned int hook, 
		  int (*okfn)(struct sk_buff *))

{

	return ipt_do_table(skb, hook, in, out,

			    nf_local_in_net(in, out)->ipv4.iptable_mangle);

			    dev_net(in)->ipv4.iptable_mangle);

}



static unsigned int
@@ -114,7 +114,7 @@ ipt_forward_hook(unsigned int hook, 
	 int (*okfn)(struct sk_buff *))

{

	return ipt_do_table(skb, hook, in, out,

			    nf_forward_net(in, out)->ipv4.iptable_mangle);

			    dev_net(in)->ipv4.iptable_mangle);

}



static unsigned int
@@ -147,7 +147,7 @@ ipt_local_hook(unsigned int hook, 
	tos = iph->tos;



	ret = ipt_do_table(skb, hook, in, out,

			   nf_local_out_net(in, out)->ipv4.iptable_mangle);

			   dev_net(out)->ipv4.iptable_mangle);

	/* Reroute for ANY change. */

	if (ret != NF_DROP && ret != NF_STOLEN && ret != NF_QUEUE) {

		iph = ip_hdr(skb);

net/ipv4/netfilter/iptable_raw.c

+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ ipt_hook(unsigned int hook, 
	 int (*okfn)(struct sk_buff *))

{

	return ipt_do_table(skb, hook, in, out,

			    nf_pre_routing_net(in, out)->ipv4.iptable_raw);

			    dev_net(in)->ipv4.iptable_raw);

}



static unsigned int
@@ -72,7 +72,7 @@ ipt_local_hook(unsigned int hook, 
		return NF_ACCEPT;

	}

	return ipt_do_table(skb, hook, in, out,

			    nf_local_out_net(in, out)->ipv4.iptable_raw);

			    dev_net(out)->ipv4.iptable_raw);

}



/* 'raw' is the very first table. */

net/ipv4/netfilter/iptable_security.c

+3 −3
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ ipt_local_in_hook(unsigned int hook, 
		  int (*okfn)(struct sk_buff *))

{

	return ipt_do_table(skb, hook, in, out,

			    nf_local_in_net(in, out)->ipv4.iptable_security);

			    dev_net(in)->ipv4.iptable_security);

}



static unsigned int
@@ -84,7 +84,7 @@ ipt_forward_hook(unsigned int hook, 
		 int (*okfn)(struct sk_buff *))

{

	return ipt_do_table(skb, hook, in, out,

			    nf_forward_net(in, out)->ipv4.iptable_security);

			    dev_net(in)->ipv4.iptable_security);

}



static unsigned int
@@ -103,7 +103,7 @@ ipt_local_out_hook(unsigned int hook, 
		return NF_ACCEPT;

	}

	return ipt_do_table(skb, hook, in, out,

			    nf_local_out_net(in, out)->ipv4.iptable_security);

			    dev_net(out)->ipv4.iptable_security);

}



static struct nf_hook_ops ipt_ops[] __read_mostly = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE