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

Commit c46d7642 authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by David S. Miller
Browse files

net: core: eliminate dev_alloc_name{,_ns} code duplication 



dev_alloc_name contained a BUG_ON(), which I moved to dev_alloc_name_ns;
the only other caller of that already has the same BUG_ON.

Signed-off-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2c88b855

net/core/dev.c

+2 −10
Original line number Diff line number Diff line
@@ -1114,6 +1114,7 @@ static int dev_alloc_name_ns(struct net *net, 
	char buf[IFNAMSIZ];

	int ret;



	BUG_ON(!net);

	ret = __dev_alloc_name(net, name, buf);

	if (ret >= 0)

		strlcpy(dev->name, buf, IFNAMSIZ);
@@ -1136,16 +1137,7 @@ static int dev_alloc_name_ns(struct net *net, 


int dev_alloc_name(struct net_device *dev, const char *name)

{

	char buf[IFNAMSIZ];

	struct net *net;

	int ret;



	BUG_ON(!dev_net(dev));

	net = dev_net(dev);

	ret = __dev_alloc_name(net, name, buf);

	if (ret >= 0)

		strlcpy(dev->name, buf, IFNAMSIZ);

	return ret;

	return dev_alloc_name_ns(dev_net(dev), dev, name);

}

EXPORT_SYMBOL(dev_alloc_name);