Commit 5796254e authored by Yejune Deng's avatar Yejune Deng Committed by David S. Miller
Browse files

net: Remove the member netns_ok 



Every protocol has the 'netns_ok' member and it is euqal to 1. The
'if (!prot->netns_ok)' always false in inet_add_protocol().

Signed-off-by: default avatarYejune Deng <yejunedeng@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 609c8ae8

include/net/protocol.h

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ struct net_protocol { 
	int			(*err_handler)(struct sk_buff *skb, u32 info);



	unsigned int		no_policy:1,

				netns_ok:1,

				/* does the protocol do more stringent

				 * icmp tag validation than simple

				 * socket lookup?

net/dccp/ipv4.c

+0 −1
Original line number Diff line number Diff line
@@ -977,7 +977,6 @@ static const struct net_protocol dccp_v4_protocol = { 
	.handler	= dccp_v4_rcv,

	.err_handler	= dccp_v4_err,

	.no_policy	= 1,

	.netns_ok	= 1,

	.icmp_strict_tag_validation = 1,

};

net/ipv4/af_inet.c

+0 −4
Original line number Diff line number Diff line
@@ -1720,7 +1720,6 @@ EXPORT_SYMBOL_GPL(snmp_fold_field64); 
#ifdef CONFIG_IP_MULTICAST

static const struct net_protocol igmp_protocol = {

	.handler =	igmp_rcv,

	.netns_ok =	1,

};

#endif
@@ -1733,7 +1732,6 @@ static struct net_protocol tcp_protocol = { 
	.handler	=	tcp_v4_rcv,

	.err_handler	=	tcp_v4_err,

	.no_policy	=	1,

	.netns_ok	=	1,

	.icmp_strict_tag_validation = 1,

};
@@ -1746,14 +1744,12 @@ static struct net_protocol udp_protocol = { 
	.handler =	udp_rcv,

	.err_handler =	udp_err,

	.no_policy =	1,

	.netns_ok =	1,

};



static const struct net_protocol icmp_protocol = {

	.handler =	icmp_rcv,

	.err_handler =	icmp_err,

	.no_policy =	1,

	.netns_ok =	1,

};



static __net_init int ipv4_mib_init_net(struct net *net)

net/ipv4/gre_demux.c

+0 −1
Original line number Diff line number Diff line
@@ -195,7 +195,6 @@ static int gre_err(struct sk_buff *skb, u32 info) 
static const struct net_protocol net_gre_protocol = {

	.handler     = gre_rcv,

	.err_handler = gre_err,

	.netns_ok    = 1,

};



static int __init gre_init(void)

net/ipv4/ipmr.c

+0 −1
Original line number Diff line number Diff line
@@ -3007,7 +3007,6 @@ static const struct seq_operations ipmr_mfc_seq_ops = { 
#ifdef CONFIG_IP_PIMSM_V2

static const struct net_protocol pim_protocol = {

	.handler	=	pim_rcv,

	.netns_ok	=	1,

};

#endif