igc: Remove the internal 'eee_advert' field

Since the kernel's 'ethtool_keee' structure is in use, the internal
'eee_advert' field becomes pointless and can be removed.

This patch comes to clean up this redundant code.

Signed-off-by: Sasha Neftin <sasha.neftin@intel.com>
Tested-by: Mor Bar-Gabay <morx.bar.gabay@intel.com> (A Contingent Worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/igc/igc.h b/drivers/net/ethernet/intel/igc/igc.h
index 8b14c029eda1ffa56443ad545daa1066d2590edd..c38b4d0f00cefad59f0faa39a1ab19de2470b432 100644 (file)
--- a/drivers/net/ethernet/intel/igc/igc.h
+++ b/drivers/net/ethernet/intel/igc/igc.h
@@ -202,7 +202,6 @@ struct igc_adapter {
        struct net_device *netdev;
 
        struct ethtool_keee eee;
-       u16 eee_advert;
 
        unsigned long state;
        unsigned int flags;

diff --git a/drivers/net/ethernet/intel/igc/igc_ethtool.c b/drivers/net/ethernet/intel/igc/igc_ethtool.c
index 0cd2bd695db1dfddd64d2c82027f4206b6609268..ab17170fe7e6e2ac9acfd4d9efc1a1d2a3553136 100644 (file)
--- a/drivers/net/ethernet/intel/igc/igc_ethtool.c
+++ b/drivers/net/ethernet/intel/igc/igc_ethtool.c
@@ -1636,10 +1636,6 @@ static int igc_ethtool_get_eee(struct net_device *netdev,
        linkmode_set_bit(ETHTOOL_LINK_MODE_100baseT_Full_BIT,
                         edata->supported);
 
-       if (hw->dev_spec._base.eee_enable)
-               mii_eee_cap1_mod_linkmode_t(edata->advertised,
-                                           adapter->eee_advert);
-
        eeer = rd32(IGC_EEER);
 
        /* EEE status on negotiated link */
@@ -1700,8 +1696,6 @@ static int igc_ethtool_set_eee(struct net_device *netdev,
                return -EINVAL;
        }
 
-       adapter->eee_advert = linkmode_to_mii_eee_cap1_t(edata->advertised);
-
        if (hw->dev_spec._base.eee_enable != edata->eee_enabled) {
                hw->dev_spec._base.eee_enable = edata->eee_enabled;
                adapter->flags |= IGC_FLAG_EEE;

diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
index 7a7cbed237d30923b2f9684543e8034c6939d83b..cb5c7b09e8a009c49e6777424ae434e59b6e26c9 100644 (file)
--- a/drivers/net/ethernet/intel/igc/igc_main.c
+++ b/drivers/net/ethernet/intel/igc/igc_main.c
@@ -4975,9 +4975,6 @@ void igc_up(struct igc_adapter *adapter)
        /* start the watchdog. */
        hw->mac.get_link_status = true;
        schedule_work(&adapter->watchdog_task);
-
-       adapter->eee_advert = MDIO_EEE_100TX | MDIO_EEE_1000T |
-                             MDIO_EEE_2_5GT;
 }
 
 /**