From: Ursula Braun <ursula.braun@xxxxxxxxxx> 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@xxxxxxxxxx> Signed-off-by: Frank Blaschka <frank.blaschka@xxxxxxxxxx> --- drivers/s390/net/netiucv.c | 2 ++ 1 file changed, 2 insertions(+) diff -urpN linux-2.6/drivers/s390/net/netiucv.c linux-2.6-patched/drivers/s390/net/netiucv.c --- linux-2.6/drivers/s390/net/netiucv.c 2011-10-24 09:10:05.000000000 +0200 +++ linux-2.6-patched/drivers/s390/net/netiucv.c 2011-11-14 18:27:17.000000000 +0100 @@ -1994,6 +1994,8 @@ static struct net_device *netiucv_init_n 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, -- To unsubscribe from this list: send the line "unsubscribe linux-s390" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html