44 lines
1.4 KiB
Diff
44 lines
1.4 KiB
Diff
From 47bca7de6a4fb8dcb564c7ca14d885c91ed19e03 Mon Sep 17 00:00:00 2001
|
|
From: Sasha Neftin <sasha.neftin@intel.com>
|
|
Date: Sat, 10 Jul 2021 20:57:50 +0300
|
|
Subject: igc: Remove phy->type checking
|
|
|
|
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@intel.com>
|
|
Tested-by: Dvora Fuxbrumer <dvorax.fuxbrumer@linux.intel.com>
|
|
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
|
|
---
|
|
drivers/net/ethernet/intel/igc/igc_main.c | 15 ++++-----------
|
|
1 file changed, 4 insertions(+), 11 deletions(-)
|
|
|
|
(limited to 'drivers/net/ethernet/intel/igc')
|
|
|
|
--- a/drivers/net/ethernet/intel/igc/igc_main.c
|
|
+++ b/drivers/net/ethernet/intel/igc/igc_main.c
|
|
@@ -4177,17 +4177,10 @@ bool igc_has_link(struct igc_adapter *ad
|
|
* 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)) {
|