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