[PATCH 2/2][SRU][OEM-5.10/OEM-5.13/OEM-5.14/H/I] igc: Remove phy->type checking

You-Sheng Yang vicamo.yang at canonical.com
Wed Oct 27 09:24:25 UTC 2021


From: Sasha Neftin <sasha.neftin at intel.com>

BugLink: https://bugs.launchpad.net/bugs/1945576

i225 devices have only one phy->type: copper. There is no point checking
phy->type during the igc_has_link method from the watchdog that
invoked every 2 seconds.
This patch comes to clean up these pointless checkings.

Signed-off-by: Sasha Neftin <sasha.neftin at intel.com>
Tested-by: Dvora Fuxbrumer <dvorax.fuxbrumer at linux.intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen at intel.com>
(cherry picked from commit 47bca7de6a4fb8dcb564c7ca14d885c91ed19e03)
Signed-off-by: You-Sheng Yang <vicamo.yang at canonical.com>
---
 drivers/net/ethernet/intel/igc/igc_main.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
index 470ca4ebb107d..9fa9cb333b038 100644
--- a/drivers/net/ethernet/intel/igc/igc_main.c
+++ b/drivers/net/ethernet/intel/igc/igc_main.c
@@ -4489,17 +4489,10 @@ bool igc_has_link(struct igc_adapter *adapter)
 	 * false until the igc_check_for_link establishes link
 	 * for copper adapters ONLY
 	 */
-	switch (hw->phy.media_type) {
-	case igc_media_type_copper:
-		if (!hw->mac.get_link_status)
-			return true;
-		hw->mac.ops.check_for_link(hw);
-		link_active = !hw->mac.get_link_status;
-		break;
-	default:
-	case igc_media_type_unknown:
-		break;
-	}
+	if (!hw->mac.get_link_status)
+		return true;
+	hw->mac.ops.check_for_link(hw);
+	link_active = !hw->mac.get_link_status;
 
 	if (hw->mac.type == igc_i225) {
 		if (!netif_carrier_ok(adapter->netdev)) {
-- 
2.32.0




More information about the kernel-team mailing list