From: Gabor Juhos <juhosg@openwrt.org>
Date: Fri, 8 Feb 2013 09:13:18 +0000 (+0000)
Subject: generic: ar8216: simplify phy features setup
X-Git-Tag: reboot~11325
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=aa044419043000c748bd8de9942ff871ac36eb50;hp=9c1f95a4164ac4f1ff254decf8278f910c5f4d57;p=oweals%2Fopenwrt.git

generic: ar8216: simplify phy features setup

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 35518
---

diff --git a/target/linux/generic/files/drivers/net/phy/ar8216.c b/target/linux/generic/files/drivers/net/phy/ar8216.c
index d980e24ee1..e6a460734f 100644
--- a/target/linux/generic/files/drivers/net/phy/ar8216.c
+++ b/target/linux/generic/files/drivers/net/phy/ar8216.c
@@ -1791,12 +1791,13 @@ ar8216_config_init(struct phy_device *pdev)
 	if (ret)
 		goto err_free_priv;
 
-	if (pdev->addr != 0) {
-		if (ar8xxx_has_gige(priv)) {
-			pdev->supported |= SUPPORTED_1000baseT_Full;
-			pdev->advertising |= ADVERTISED_1000baseT_Full;
-		}
+	if (ar8xxx_has_gige(priv))
+		pdev->supported = SUPPORTED_1000baseT_Full;
+	else
+		pdev->supported = SUPPORTED_100baseT_Full;
+	pdev->advertising = pdev->supported;
 
+	if (pdev->addr != 0) {
 		if (chip_is_ar8316(priv)) {
 			/* check if we're attaching to the switch twice */
 			pdev = pdev->bus->phy_map[0];
@@ -1827,12 +1828,6 @@ ar8216_config_init(struct phy_device *pdev)
 		return 0;
 	}
 
-	if (ar8xxx_has_gige(priv))
-		pdev->supported = SUPPORTED_1000baseT_Full;
-	else
-		pdev->supported = SUPPORTED_100baseT_Full;
-	pdev->advertising = pdev->supported;
-
 	mutex_init(&priv->reg_mutex);
 
 	pdev->priv = priv;