Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 721499e8 authored by YOSHIFUJI Hideaki's avatar YOSHIFUJI Hideaki Committed by David S. Miller
Browse files

netns: Use net_eq() to compare net-namespaces for optimization. 



Without CONFIG_NET_NS, namespace is always &init_net.
Compiler will be able to omit namespace comparisons with this patch.

Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 407d819c

net/appletalk/aarp.c

+2 −2
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ static int aarp_device_event(struct notifier_block *this, unsigned long event, 
	struct net_device *dev = ptr;

	int ct;



	if (dev_net(dev) != &init_net)

	if (!net_eq(dev_net(dev), &init_net))

		return NOTIFY_DONE;



	if (event == NETDEV_DOWN) {
@@ -716,7 +716,7 @@ static int aarp_rcv(struct sk_buff *skb, struct net_device *dev, 
	struct atalk_addr sa, *ma, da;

	struct atalk_iface *ifa;



	if (dev_net(dev) != &init_net)

	if (!net_eq(dev_net(dev), &init_net))

		goto out0;



	/* We only do Ethernet SNAP AARP. */

net/appletalk/ddp.c

+3 −3
Original line number Diff line number Diff line
@@ -648,7 +648,7 @@ static int ddp_device_event(struct notifier_block *this, unsigned long event, 
{

	struct net_device *dev = ptr;



	if (dev_net(dev) != &init_net)

	if (!net_eq(dev_net(dev), &init_net))

		return NOTIFY_DONE;



	if (event == NETDEV_DOWN)
@@ -1405,7 +1405,7 @@ static int atalk_rcv(struct sk_buff *skb, struct net_device *dev, 
	int origlen;

	__u16 len_hops;



	if (dev_net(dev) != &init_net)

	if (!net_eq(dev_net(dev), &init_net))

		goto freeit;



	/* Don't mangle buffer if shared */
@@ -1493,7 +1493,7 @@ static int atalk_rcv(struct sk_buff *skb, struct net_device *dev, 
static int ltalk_rcv(struct sk_buff *skb, struct net_device *dev,

		     struct packet_type *pt, struct net_device *orig_dev)

{

	if (dev_net(dev) != &init_net)

	if (!net_eq(dev_net(dev), &init_net))

		goto freeit;



	/* Expand any short form frames */

net/atm/clip.c

+1 −1
Original line number Diff line number Diff line
@@ -612,7 +612,7 @@ static int clip_device_event(struct notifier_block *this, unsigned long event, 
{

	struct net_device *dev = arg;



	if (dev_net(dev) != &init_net)

	if (!net_eq(dev_net(dev), &init_net))

		return NOTIFY_DONE;



	if (event == NETDEV_UNREGISTER) {

net/atm/mpc.c

+1 −1
Original line number Diff line number Diff line
@@ -964,7 +964,7 @@ static int mpoa_event_listener(struct notifier_block *mpoa_notifier, unsigned lo 


	dev = (struct net_device *)dev_ptr;



	if (dev_net(dev) != &init_net)

	if (!net_eq(dev_net(dev), &init_net))

		return NOTIFY_DONE;



	if (dev->name == NULL || strncmp(dev->name, "lec", 3))

net/ax25/af_ax25.c

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static int ax25_device_event(struct notifier_block *this, unsigned long event, 
{

	struct net_device *dev = (struct net_device *)ptr;



	if (dev_net(dev) != &init_net)

	if (!net_eq(dev_net(dev), &init_net))

		return NOTIFY_DONE;



	/* Reject non AX.25 devices */