igc: Remove copper fiber switch control (2e39d2c8) · Commits · 戴 / test

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -91,8 +91,6 @@
		#define IGC_CTRL_RFCE 0x08000000 /* Receive Flow Control enable */
		#define IGC_CTRL_TFCE 0x10000000 /* Transmit flow control enable */

		#define IGC_CONNSW_AUTOSENSE_EN 0x1

		/* As per the EAS the maximum supported size is 9.5KB (9728 bytes) */
		#define MAX_JUMBO_FRAME_SIZE 0x2600

+0 −9

Original line number	Diff line number	Diff line
		@@ -4033,7 +4033,6 @@ static void igc_watchdog_task(struct work_struct *work)
		struct igc_hw *hw = &adapter->hw;
		struct igc_phy_info *phy = &hw->phy;
		u16 phy_data, retry_count = 20;
		u32 connsw;
		u32 link;
		int i;

		@@ -4046,14 +4045,6 @@ static void igc_watchdog_task(struct work_struct *work)
		link = false;
		}

		/* Force link down if we have fiber to swap to */
		if (adapter->flags & IGC_FLAG_MAS_ENABLE) {
		if (hw->phy.media_type == igc_media_type_copper) {
		connsw = rd32(IGC_CONNSW);
		if (!(connsw & IGC_CONNSW_AUTOSENSE_EN))
		link = 0;
		}
		}
		if (link) {
		/* Cancel scheduled suspend requests. */
		pm_runtime_resume(netdev->dev.parent);