fix link status detection in various switch drivers
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Tue, 8 Dec 2009 14:06:09 +0000 (14:06 +0000)
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Tue, 8 Dec 2009 14:06:09 +0000 (14:06 +0000)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18698 3c298f89-4303-0410-b956-a3cf2f4a3e73

target/linux/generic-2.6/files/drivers/net/phy/adm6996.c
target/linux/generic-2.6/files/drivers/net/phy/ar8216.c
target/linux/generic-2.6/files/drivers/net/phy/mvswitch.c
target/linux/generic-2.6/files/drivers/net/phy/rtl8306.c

index 972d20c..bc40be0 100644 (file)
@@ -96,7 +96,7 @@ static int adm6996_read_status(struct phy_device *phydev)
 {
        phydev->speed = SPEED_100;
        phydev->duplex = DUPLEX_FULL;
 {
        phydev->speed = SPEED_100;
        phydev->duplex = DUPLEX_FULL;
-       phydev->state = PHY_UP;
+       phydev->link = 1;
        return 0;
 }
 
        return 0;
 }
 
index 93e4b33..92cc9f3 100644 (file)
@@ -546,7 +546,7 @@ ar8216_read_status(struct phy_device *phydev)
 
        phydev->speed = SPEED_100;
        phydev->duplex = DUPLEX_FULL;
 
        phydev->speed = SPEED_100;
        phydev->duplex = DUPLEX_FULL;
-       phydev->state = PHY_UP;
+       phydev->link = 1;
 
        /* flush the address translation unit */
        if (ar8216_wait_bit(priv, AR8216_REG_ATU, AR8216_ATU_ACTIVE, 0))
 
        /* flush the address translation unit */
        if (ar8216_wait_bit(priv, AR8216_REG_ATU, AR8216_ATU_ACTIVE, 0))
index 3ae8899..c2f3245 100644 (file)
@@ -366,7 +366,7 @@ mvswitch_read_status(struct phy_device *pdev)
 {
        pdev->speed = SPEED_100;
        pdev->duplex = DUPLEX_FULL;
 {
        pdev->speed = SPEED_100;
        pdev->duplex = DUPLEX_FULL;
-       pdev->state = PHY_UP;
+       pdev->link = 1;
 
        /* XXX ugly workaround: we can't force the switch
         * to gracefully handle hosts moving from one port to another,
 
        /* XXX ugly workaround: we can't force the switch
         * to gracefully handle hosts moving from one port to another,
index eba0bab..259ff50 100644 (file)
@@ -954,7 +954,7 @@ rtl8306_read_status(struct phy_device *pdev)
 {
        pdev->speed = SPEED_100;
        pdev->duplex = DUPLEX_FULL;
 {
        pdev->speed = SPEED_100;
        pdev->duplex = DUPLEX_FULL;
-       pdev->state = PHY_UP;
+       pdev->link = 1;
 
        return 0;
 }
 
        return 0;
 }