Commit 6cc1b2fd authored by Sasha Neftin's avatar Sasha Neftin Committed by Tony Nguyen
Browse files

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: default avatarSasha Neftin <sasha.neftin@intel.com>
Tested-by: default avatarNaama Meir <naamax.meir@linux.intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 92a0dcb8

drivers/net/ethernet/intel/igc/igc.h

+0 −2
Original line number Diff line number Diff line
@@ -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)

drivers/net/ethernet/intel/igc/igc_main.c

+0 −17
Original line number Diff line number Diff line
@@ -5578,25 +5578,8 @@ static void igc_watchdog_task(struct work_struct *work) 
				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;

			}

		}

	}