netiucv: reinsert dev_alloc_name for device naming
authorUrsula Braun <ursula.braun@de.ibm.com>
Tue, 15 Nov 2011 02:31:14 +0000 (02:31 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 16 Nov 2011 22:28:10 +0000 (17:28 -0500)
Invocation of dev_alloc_name() is re-inserted, because the created
net_device name is used to create the device name for the iucv bus.
This device is created before the register_netdev call.

Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/s390/net/netiucv.c

index 3251333a23df18b6e8f378f0f681ac818145f0e1..b6a6356d09b3a52857a1f47f14d1a2241b04e142 100644 (file)
@@ -1994,6 +1994,8 @@ static struct net_device *netiucv_init_netdevice(char *username)
                           netiucv_setup_netdevice);
        if (!dev)
                return NULL;
+       if (dev_alloc_name(dev, dev->name) < 0)
+               goto out_netdev;
 
        privptr = netdev_priv(dev);
        privptr->fsm = init_fsm("netiucvdev", dev_state_names,