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

Commit c835a677 authored by Tom Gundersen's avatar Tom Gundersen Committed by David S. Miller
Browse files

net: set name_assign_type in alloc_netdev() 



Extend alloc_netdev{,_mq{,s}}() to take name_assign_type as argument, and convert
all users to pass NET_NAME_UNKNOWN.

Coccinelle patch:

@@
expression sizeof_priv, name, setup, txqs, rxqs, count;
@@

(
-alloc_netdev_mqs(sizeof_priv, name, setup, txqs, rxqs)
+alloc_netdev_mqs(sizeof_priv, name, NET_NAME_UNKNOWN, setup, txqs, rxqs)
|
-alloc_netdev_mq(sizeof_priv, name, setup, count)
+alloc_netdev_mq(sizeof_priv, name, NET_NAME_UNKNOWN, setup, count)
|
-alloc_netdev(sizeof_priv, name, setup)
+alloc_netdev(sizeof_priv, name, NET_NAME_UNKNOWN, setup)
)

v9: move comments here from the wrong commit

Signed-off-by: default avatarTom Gundersen <teg@jklm.no>
Reviewed-by: default avatarDavid Herrmann <dh.herrmann@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 238fa362

drivers/firewire/net.c

+2 −1
Original line number Diff line number Diff line
@@ -1460,7 +1460,8 @@ static int fwnet_probe(struct fw_unit *unit, 
		goto have_dev;

	}



	net = alloc_netdev(sizeof(*dev), "firewire%d", fwnet_init_dev);

	net = alloc_netdev(sizeof(*dev), "firewire%d", NET_NAME_UNKNOWN,

			   fwnet_init_dev);

	if (net == NULL) {

		mutex_unlock(&fwnet_device_mutex);

		return -ENOMEM;

drivers/hsi/clients/ssi_protocol.c

+1 −1
Original line number Diff line number Diff line
@@ -1115,7 +1115,7 @@ static int ssi_protocol_probe(struct device *dev) 
		goto out;

	}



	ssi->netdev = alloc_netdev(0, ifname, ssip_pn_setup);

	ssi->netdev = alloc_netdev(0, ifname, NET_NAME_UNKNOWN, ssip_pn_setup);

	if (!ssi->netdev) {

		dev_err(dev, "No memory for netdev\n");

		err = -ENOMEM;

drivers/infiniband/hw/amso1100/c2_provider.c

+1 −1
Original line number Diff line number Diff line
@@ -734,7 +734,7 @@ static struct net_device *c2_pseudo_netdev_init(struct c2_dev *c2dev) 
	/* change ethxxx to iwxxx */

	strcpy(name, "iw");

	strcat(name, &c2dev->netdev->name[3]);

	netdev = alloc_netdev(0, name, setup);

	netdev = alloc_netdev(0, name, NET_NAME_UNKNOWN, setup);

	if (!netdev) {

		printk(KERN_ERR PFX "%s -  etherdev alloc failed",

			__func__);

drivers/infiniband/ulp/ipoib/ipoib_main.c

+2 −2
Original line number Diff line number Diff line
@@ -1395,7 +1395,7 @@ struct ipoib_dev_priv *ipoib_intf_alloc(const char *name) 
	struct net_device *dev;



	dev = alloc_netdev((int)sizeof(struct ipoib_dev_priv), name,

			   ipoib_setup);

			   NET_NAME_UNKNOWN, ipoib_setup);

	if (!dev)

		return NULL;

drivers/isdn/i4l/isdn_net.c

+2 −1
Original line number Diff line number Diff line
@@ -2588,7 +2588,8 @@ isdn_net_new(char *name, struct net_device *master) 
		printk(KERN_WARNING "isdn_net: Could not allocate net-device\n");

		return NULL;

	}

	netdev->dev = alloc_netdev(sizeof(isdn_net_local), name, _isdn_setup);

	netdev->dev = alloc_netdev(sizeof(isdn_net_local), name,

				   NET_NAME_UNKNOWN, _isdn_setup);

	if (!netdev->dev) {

		printk(KERN_WARNING "isdn_net: Could not allocate network device\n");

		kfree(netdev);