From: Gabor Juhos <juhosg@openwrt.org>
Date: Wed, 7 Mar 2012 16:32:35 +0000 (+0000)
Subject: ar71xx: ag71xx: fix get_port_link callback
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c455a0f7be2479d8eaa959be3452a8d887591e3b;p=openwrt%2Fstaging%2Fldir.git

ar71xx: ag71xx: fix get_port_link callback

SVN-Revision: 30841
---

diff --git a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ar7240.c b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ar7240.c
index 4866aac7ea..8a497b0cab 100644
--- a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ar7240.c
+++ b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ar7240.c
@@ -888,9 +888,15 @@ ar7240_get_port_link(struct switch_dev *dev, int port,
 		return -EINVAL;
 
 	status = ar7240sw_reg_read(mii, AR7240_REG_PORT_STATUS(port));
-
-	link->link = !!(status & AR7240_PORT_STATUS_LINK_UP);
 	link->aneg = !!(status & AR7240_PORT_STATUS_LINK_AUTO);
+	if (link->aneg) {
+		link->link = !!(status & AR7240_PORT_STATUS_LINK_UP);
+		if (!link->link)
+			return 0;
+	} else {
+		link->link = true;
+	}
+
 	link->duplex = !!(status & AR7240_PORT_STATUS_DUPLEX);
 	link->tx_flow = !!(status & AR7240_PORT_STATUS_TXFLOW);
 	link->rx_flow = !!(status & AR7240_PORT_STATUS_RXFLOW);