igc: Clean up and optimize watchdog task

i225/i226 parts used only one media type copper. The copper media type is
not replaceable. Clean up the code accordingly, and remove the obsolete
media replacement and reset options.

Signed-off-by: Sasha Neftin <sasha.neftin@intel.com>
Tested-by: Naama Meir <naamax.meir@linux.intel.com>
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 c0c00b8bd8d899dcc1e2191da3cd61e2b588489a..34aebf00a5123893fd7097e97e260a9c1c23354c 100644 (file)
--- a/drivers/net/ethernet/intel/igc/igc.h
+++ b/drivers/net/ethernet/intel/igc/igc.h
@@ -294,8 +294,6 @@ extern char igc_driver_name[];
 #define IGC_FLAG_PTP                   BIT(8)
 #define IGC_FLAG_WOL_SUPPORTED         BIT(8)
 #define IGC_FLAG_NEED_LINK_UPDATE      BIT(9)
-#define IGC_FLAG_MEDIA_RESET           BIT(10)
-#define IGC_FLAG_MAS_ENABLE            BIT(12)
 #define IGC_FLAG_HAS_MSIX              BIT(13)
 #define IGC_FLAG_EEE                   BIT(14)
 #define IGC_FLAG_VLAN_PROMISC          BIT(15)

diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
index 1e1245085a36d2b0239ccdf706d47010fa3d1dbc..2c40796c151fb66c41f484531d0a0135de510903 100644 (file)
--- a/drivers/net/ethernet/intel/igc/igc_main.c
+++ b/drivers/net/ethernet/intel/igc/igc_main.c
@@ -5578,25 +5578,8 @@ no_wait:
                                mod_timer(&adapter->phy_info_timer,
                                          round_jiffies(jiffies + 2 * HZ));
 
-                       /* link is down, time to check for alternate media */
-                       if (adapter->flags & IGC_FLAG_MAS_ENABLE) {
-                               if (adapter->flags & IGC_FLAG_MEDIA_RESET) {
-                                       schedule_work(&adapter->reset_task);
-                                       /* return immediately */
-                                       return;
-                               }
-                       }
                        pm_schedule_suspend(netdev->dev.parent,
                                            MSEC_PER_SEC * 5);
-
-               /* also check for alternate media here */
-               } else if (!netif_carrier_ok(netdev) &&
-                          (adapter->flags & IGC_FLAG_MAS_ENABLE)) {
-                       if (adapter->flags & IGC_FLAG_MEDIA_RESET) {
-                               schedule_work(&adapter->reset_task);
-                               /* return immediately */
-                               return;
-                       }
                }
        }