lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xtensa: ISS: init network interface name before the probe

Browse Source 
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Chris Zankel <chris@zankel.net>
This commit is contained in:
Max Filippov
2013-11-10 16:05:46 +04:00
committed by Chris Zankel
parent 8c8ad85f1f
commit 358b181003
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
arch/xtensa/platforms/iss/network.c
View File

@ -544,6 +544,13 @@ static int iss_net_configure(int index, char *init)
.have_mac = 0, .have_mac = 0,
}; };
/*
* If this name ends up conflicting with an existing registered
* netdevice, that is OK, register_netdev{,ice}() will notice this
* and fail.
*/
snprintf(dev->name, sizeof(dev->name), "eth%d", index);
/* /*
* Try all transport protocols. * Try all transport protocols.
* Note: more protocols can be added by adding '&& !X_init(lp, eth)'. * Note: more protocols can be added by adding '&& !X_init(lp, eth)'.
@ -575,13 +582,6 @@ static int iss_net_configure(int index, char *init)
platform_device_register(&lp->pdev); platform_device_register(&lp->pdev);
SET_NETDEV_DEV(dev, &lp->pdev.dev); SET_NETDEV_DEV(dev, &lp->pdev.dev);
/*
* If this name ends up conflicting with an existing registered
* netdevice, that is OK, register_netdev{,ice}() will notice this
* and fail.
*/
snprintf(dev->name, sizeof(dev->name), "eth%d", index);
dev->netdev_ops = &iss_netdev_ops; dev->netdev_ops = &iss_netdev_ops;
dev->mtu = lp->mtu; dev->mtu = lp->mtu;
dev->watchdog_timeo = (HZ >> 1); dev->watchdog_timeo = (HZ >> 1);