diff -r -u -x CVS R23/drivers/net/ixp425_eth.c R29/drivers/net/ixp425_eth.c --- R23/drivers/net/ixp425_eth.c 2004-07-02 08:13:45.000000000 +0100 +++ R29/drivers/net/ixp425_eth.c 2004-10-13 07:44:13.000000000 +0100 @@ -6,7 +6,7 @@ * IXP425 Ethernet Driver for Linux * * -- Copyright Notice -- - * Copyright © 2004, Intel Corporation. + * Copyright ?2004, Intel Corporation. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -162,7 +162,7 @@ /* Dictates the rate (per second) at which the NPE queues are serviced */ /* 4000 times/sec = 37 mbufs/interrupt at line rate */ -#define QUEUE_DISPATCH_TIMER_RATE (4000) +#define QUEUE_DISPATCH_TIMER_RATE (2000) /* Tunable value, the highest helps for steady rate traffic, but too high * increases the packet drops. @@ -398,9 +398,16 @@ static int phyAddresses[IXP425_ETH_ACC_MII_MAX_ADDR] = { #ifdef CONFIG_ARCH_IXDP425 + /* + * Our board only one Ethernet port. And this port connect to PHY 2 while + * we call this port ixp0. So we need to cross port 1 and 2. + * Argon Cheng + * 2004-07-23 +*/ + /* 1 PHY per NPE port */ - 0, /* Port 1 (ixp0) */ - 1 /* Port 2 (ixp1) */ + 1, /* Port 1 (ixp0) */ + 0 /* Port 2 (ixp1) */ #elif defined(CONFIG_ARCH_COYOTE) || defined(CONFIG_ARCH_IXRD425) 4, /* Port 1 (ixp0) - Connected to PHYs 1-4 */ @@ -2519,6 +2526,8 @@ /* Initialize device structs. * Resource allocation is deffered until do_dev_open */ +char * get_ixp0_ethaddr(void); + static int __devinit dev_eth_probe(struct net_device *dev) { static int found_devices = 0;