summaryrefslogtreecommitdiff
path: root/drivers/s390
diff options
context:
space:
mode:
authorUrsula Braun <ursula.braun@de.ibm.com>2011-11-15 02:31:14 +0000
committerDavid S. Miller <davem@davemloft.net>2011-11-16 17:28:10 -0500
commit1d503563f7601a249d015d3fad40b08e8d6a394b (patch)
treef8af60ff91048d0edf5e2f4be4985a4cf248af9c /drivers/s390
parent7c01a8e56bf8a03b9b50a770de36abfee03c4fc5 (diff)
downloadlwn-1d503563f7601a249d015d3fad40b08e8d6a394b.tar.gz
lwn-1d503563f7601a249d015d3fad40b08e8d6a394b.zip
netiucv: reinsert dev_alloc_name for device naming
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>
Diffstat (limited to 'drivers/s390')
-rw-r--r--drivers/s390/net/netiucv.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c
index 3251333a23df..b6a6356d09b3 100644
--- a/drivers/s390/net/netiucv.c
+++ b/drivers/s390/net/netiucv.c
@@ -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,