aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-12-08 14:06:09 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-12-08 14:06:09 +0000
commit5232331c981742da7fc3423a2e16f44247f10ba1 (patch)
treeea2a42c9f6a37b76513d340a64ed9ad478df15ae
parent9828d89496fe4afb99481cd872d8cb8f806831fc (diff)
downloadupstream-5232331c981742da7fc3423a2e16f44247f10ba1.tar.gz
upstream-5232331c981742da7fc3423a2e16f44247f10ba1.tar.bz2
upstream-5232331c981742da7fc3423a2e16f44247f10ba1.zip
fix link status detection in various switch drivers
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18698 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/generic-2.6/files/drivers/net/phy/adm6996.c2
-rw-r--r--target/linux/generic-2.6/files/drivers/net/phy/ar8216.c2
-rw-r--r--target/linux/generic-2.6/files/drivers/net/phy/mvswitch.c2
-rw-r--r--target/linux/generic-2.6/files/drivers/net/phy/rtl8306.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic-2.6/files/drivers/net/phy/adm6996.c b/target/linux/generic-2.6/files/drivers/net/phy/adm6996.c
index 972d20c6d9..bc40be067a 100644
--- a/target/linux/generic-2.6/files/drivers/net/phy/adm6996.c
+++ b/target/linux/generic-2.6/files/drivers/net/phy/adm6996.c
@@ -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;
}
diff --git a/target/linux/generic-2.6/files/drivers/net/phy/ar8216.c b/target/linux/generic-2.6/files/drivers/net/phy/ar8216.c
index 93e4b33d94..92cc9f384b 100644
--- a/target/linux/generic-2.6/files/drivers/net/phy/ar8216.c
+++ b/target/linux/generic-2.6/files/drivers/net/phy/ar8216.c
@@ -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))
diff --git a/target/linux/generic-2.6/files/drivers/net/phy/mvswitch.c b/target/linux/generic-2.6/files/drivers/net/phy/mvswitch.c
index 3ae8899c2a..c2f3245720 100644
--- a/target/linux/generic-2.6/files/drivers/net/phy/mvswitch.c
+++ b/target/linux/generic-2.6/files/drivers/net/phy/mvswitch.c
@@ -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,
diff --git a/target/linux/generic-2.6/files/drivers/net/phy/rtl8306.c b/target/linux/generic-2.6/files/drivers/net/phy/rtl8306.c
index eba0babe28..259ff5006f 100644
--- a/target/linux/generic-2.6/files/drivers/net/phy/rtl8306.c
+++ b/target/linux/generic-2.6/files/drivers/net/phy/rtl8306.c
@@ -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;
}