From: Gabor Juhos Date: Wed, 7 Mar 2012 16:32:43 +0000 (+0000) Subject: generic: ar8216: use ar8216_read_port_link to get the CPU port link parameters X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2370828599ea3b5d990082d8b439c1fdba97cc9a;p=openwrt%2Fstaging%2Fnbd.git generic: ar8216: use ar8216_read_port_link to get the CPU port link parameters SVN-Revision: 30846 --- diff --git a/target/linux/generic/files/drivers/net/phy/ar8216.c b/target/linux/generic/files/drivers/net/phy/ar8216.c index 38ccaa36a7..2e3a8426b0 100644 --- a/target/linux/generic/files/drivers/net/phy/ar8216.c +++ b/target/linux/generic/files/drivers/net/phy/ar8216.c @@ -929,14 +929,31 @@ static int ar8216_read_status(struct phy_device *phydev) { struct ar8216_priv *priv = phydev->priv; + struct switch_port_link link; int ret; if (phydev->addr != 0) { return genphy_read_status(phydev); } - phydev->speed = priv->chip == AR8316 ? SPEED_1000 : SPEED_100; - phydev->duplex = DUPLEX_FULL; - phydev->link = 1; + ar8216_read_port_link(priv, phydev->addr, &link); + phydev->link = !!link.link; + if (!phydev->link) + return 0; + + switch (link.speed) { + case SWITCH_PORT_SPEED_10: + phydev->speed = SPEED_10; + break; + case SWITCH_PORT_SPEED_100: + phydev->speed = SPEED_100; + break; + case SWITCH_PORT_SPEED_1000: + phydev->speed = SPEED_1000; + break; + default: + phydev->speed = 0; + } + phydev->duplex = link.duplex ? DUPLEX_FULL : DUPLEX_HALF; /* flush the address translation unit */ mutex_lock(&priv->reg_mutex);