fix link status detection in various switch drivers
authorFelix Fietkau <nbd@openwrt.org>
Tue, 8 Dec 2009 14:06:09 +0000 (14:06 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Tue, 8 Dec 2009 14:06:09 +0000 (14:06 +0000)
SVN-Revision: 18698

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 972d20c6d956459c1acfad8e7a3e0ec56bbd8dd3..bc40be067a6c251354d01238624ecff5efa8c830 100644 (file)
@@ -96,7 +96,7 @@ static int adm6996_read_status(struct phy_device *phydev)
 {
        phydev->speed = SPEED_100;
        phydev->duplex = DUPLEX_FULL;
-       phydev->state = PHY_UP;
+       phydev->link = 1;
        return 0;
 }
 
index 93e4b33d94c038ba5f3fb9fe60a57f879f1a13c8..92cc9f384b98981b9212cbbc13fdab55c96b75fb 100644 (file)
@@ -546,7 +546,7 @@ ar8216_read_status(struct phy_device *phydev)
 
        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))
index 3ae8899c2a65f018cfc642dd4679893f728e819a..c2f32457205f6f958ad59d620f346139c0be0bd2 100644 (file)
@@ -366,7 +366,7 @@ mvswitch_read_status(struct phy_device *pdev)
 {
        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,
index eba0babe28ed4460e857c43188ea8429964f47d0..259ff5006fb0e5bd158b41568324bb0e57d92ede 100644 (file)
@@ -954,7 +954,7 @@ rtl8306_read_status(struct phy_device *pdev)
 {
        pdev->speed = SPEED_100;
        pdev->duplex = DUPLEX_FULL;
-       pdev->state = PHY_UP;
+       pdev->link = 1;
 
        return 0;
 }