alx: separate link speed/duplex fields

As suggested by Ben Hutchings, use separate fields to track
current link speed and duplex setting.

Reported-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 20 insertions, 17 deletions

diff --git a/drivers/net/ethernet/atheros/alx/main.c b/drivers/net/ethernet/atheros/alx/main.c
index 418de8b13165..148b4b976474 100644
--- a/drivers/net/ethernet/atheros/alx/main.c
+++ b/drivers/net/ethernet/atheros/alx/main.c
@@ -712,6 +712,7 @@ static int alx_init_sw(struct alx_priv *alx)
         hw->dma_chnl = hw->max_dma_chnl;
         hw->ith_tpd = alx->tx_ringsz / 3;
         hw->link_speed = SPEED_UNKNOWN;
+        hw->duplex = DUPLEX_UNKNOWN;
         hw->adv_cfg = ADVERTISED_Autoneg |
                       ADVERTISED_10baseT_Half |
                       ADVERTISED_10baseT_Full |
@@ -758,6 +759,7 @@ static void alx_halt(struct alx_priv *alx)
 
         alx_netif_stop(alx);
         hw->link_speed = SPEED_UNKNOWN;
+        hw->duplex = DUPLEX_UNKNOWN;
 
         alx_reset_mac(hw);
 
@@ -869,18 +871,18 @@ static void __alx_stop(struct alx_priv *alx)
         alx_free_rings(alx);
 }
 
-static const char *alx_speed_desc(u16 speed)
+static const char *alx_speed_desc(struct alx_hw *hw)
 {
-        switch (speed) {
-        case SPEED_1000 + DUPLEX_FULL:
+        switch (alx_speed_to_ethadv(hw->link_speed, hw->duplex)) {
+        case ADVERTISED_1000baseT_Full:
                 return "1 Gbps Full";
-        case SPEED_100 + DUPLEX_FULL:
+        case ADVERTISED_100baseT_Full:
                 return "100 Mbps Full";
-        case SPEED_100 + DUPLEX_HALF:
+        case ADVERTISED_100baseT_Half:
                 return "100 Mbps Half";
-        case SPEED_10 + DUPLEX_FULL:
+        case ADVERTISED_10baseT_Full:
                 return "10 Mbps Full";
-        case SPEED_10 + DUPLEX_HALF:
+        case ADVERTISED_10baseT_Half:
                 return "10 Mbps Half";
         default:
                 return "Unknown speed";
@@ -891,7 +893,8 @@ static void alx_check_link(struct alx_priv *alx)
 {
         struct alx_hw *hw = &alx->hw;
         unsigned long flags;
-        int speed, old_speed;
+        int old_speed;
+        u8 old_duplex;
         int err;
 
         /* clear PHY internal interrupt status, otherwise the main
@@ -899,7 +902,9 @@ static void alx_check_link(struct alx_priv *alx)
          */
         alx_clear_phy_intr(hw);
 
-        err = alx_get_phy_link(hw, &speed);
+        old_speed = hw->link_speed;
+        old_duplex = hw->duplex;
+        err = alx_read_phy_link(hw);
         if (err < 0)
                 goto reset;
 
@@ -908,15 +913,12 @@ static void alx_check_link(struct alx_priv *alx)
         alx_write_mem32(hw, ALX_IMR, alx->int_mask);
         spin_unlock_irqrestore(&alx->irq_lock, flags);
 
-        old_speed = hw->link_speed;
-
-        if (old_speed == speed)
+        if (old_speed == hw->link_speed)
                 return;
-        hw->link_speed = speed;
 
-        if (speed != SPEED_UNKNOWN) {
+        if (hw->link_speed != SPEED_UNKNOWN) {
                 netif_info(alx, link, alx->dev,
-                           "NIC Up: %s\n", alx_speed_desc(speed));
+                           "NIC Up: %s\n", alx_speed_desc(hw));
                 alx_post_phy_link(hw);
                 alx_enable_aspm(hw, true, true);
                 alx_start_mac(hw);
@@ -965,6 +967,7 @@ static int __alx_shutdown(struct pci_dev *pdev, bool *wol_en)
         struct net_device *netdev = alx->dev;
         struct alx_hw *hw = &alx->hw;
         int err, speed;
+        u8 duplex;
 
         netif_device_detach(netdev);
 
@@ -977,13 +980,13 @@ static int __alx_shutdown(struct pci_dev *pdev, bool *wol_en)
                 return err;
 #endif
 
-        err = alx_select_powersaving_speed(hw, &speed);
+        err = alx_select_powersaving_speed(hw, &speed, &duplex);
         if (err)
                 return err;
         err = alx_clear_phy_intr(hw);
         if (err)
                 return err;
-        err = alx_pre_suspend(hw, speed);
+        err = alx_pre_suspend(hw, speed, duplex);
         if (err)
                 return err;
         err = alx_config_wol(hw);