register the ethernet devices as ethX ixp400_eth.c | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) Index: ixp400-eth-1.5.1-r0/ixp400_eth.c =================================================================== --- ixp400-eth-1.5.1-r0.orig/ixp400_eth.c +++ ixp400-eth-1.5.1-r0/ixp400_eth.c @@ -160,9 +160,6 @@ MODULE_PARM(dev_max_count, "i"); MODULE_PARM_DESC(dev_max_count, "Number of devices to initialize"); -/* devices will be called ixp0 and ixp1 */ -#define DEVICE_NAME "ixp" - /* boolean values for PHY link speed, duplex, and autonegotiation */ #define PHY_SPEED_10 0 #define PHY_SPEED_100 1 @@ -1579,7 +1576,7 @@ if (request_irq(IX_OSAL_IXP400_XSCALE_PMU_IRQ_LVL, dev_pmu_timer_os_isr, SA_SHIRQ, - DEVICE_NAME, + MODULE_NAME, (void *)IRQ_ANY_PARAMETER)) { P_ERROR("Failed to reassign irq to PMU timer interrupt!\n"); @@ -3035,8 +3032,8 @@ if (port_id == IX_ETH_PORT_2) npe_id = "C"; if (port_id == IX_ETH_PORT_3) npe_id = "A"; - P_INFO("%s%d is using NPE%s and the PHY at address %d\n", - DEVICE_NAME, port_id, npe_id, phyAddresses[port_id]); + P_INFO("ethernet %d is using NPE%s and the PHY at address %d\n", + dev_count, npe_id, phyAddresses[port_id]); /* Set the MAC to the same duplex mode as the phy */ ixEthAccPortDuplexModeSet(port_id, @@ -3244,9 +3241,6 @@ /* set the private port ID */ priv->port_id = portId; - /* set device name */ - sprintf(ndev->name, DEVICE_NAME"%d", priv->port_id); - TRACE; /* initialize RX pool */