Commit 358b1810 authored by Max Filippov's avatar Max Filippov Committed by Chris Zankel
Browse files

xtensa: ISS: init network interface name before the probe 



Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
Signed-off-by: default avatarChris Zankel <chris@zankel.net>
parent 8c8ad85f

arch/xtensa/platforms/iss/network.c

+7 −7
Original line number Diff line number Diff line
@@ -544,6 +544,13 @@ static int iss_net_configure(int index, char *init) 
		.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.

	 * 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);

	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->mtu = lp->mtu;

	dev->watchdog_timeo = (HZ >> 1);