CVS Update@linux-mips.org: linux

[ralf@linux-mips.org]

CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ralf@ftp.linux-mips.org 05/07/01 11:43:17

Modified files:
        drivers/net    : ioc3-eth.c 

Log message:
        First check the link, then configure duplex in the NIC.  Without this
        the IOC3 might missbehave until the MII timer runs for the first time.

diff -urN linux/drivers/net/ioc3-eth.c linux/drivers/net/ioc3-eth.c
--- linux/drivers/net/ioc3-eth.c        2005/07/01 09:28:30     1.100
+++ linux/drivers/net/ioc3-eth.c        2005/07/01 10:43:17     1.101
@@ -1291,7 +1291,6 @@
        dev->features           = NETIF_F_IP_CSUM;
 #endif
 
-       ioc3_setup_duplex(ip);
        sw_physid1 = ioc3_mdio_read(dev, ip->mii.phy_id, MII_PHYSID1);
        sw_physid2 = ioc3_mdio_read(dev, ip->mii.phy_id, MII_PHYSID2);
 
@@ -1300,6 +1299,7 @@
                goto out_stop;
 
        mii_check_media(&ip->mii, 1, 1);
+       ioc3_setup_duplex(ip);
 
        vendor = (sw_physid1 << 12) | (sw_physid2 >> 4);
        model  = (sw_physid2 >> 4) & 0x3f;