diff options
| author | John Audia <therealgraysky@proton.me> | 2022-05-25 13:09:23 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-06-07 22:28:59 +0200 |
| commit | 49f8a75031c8fb2efc4824166da75f1473cdab6b (patch) | |
| tree | 8735a6f849807516e7c1cc015616d5c584491a3c /target/linux/generic/backport-5.10/774-v5.15-2-igc-remove-phy-type-checking.patch | |
| parent | 3ce3de934c34b8d36012cb687b38e5bcff62f95d (diff) | |
| download | upstream-49f8a75031c8fb2efc4824166da75f1473cdab6b.tar.gz upstream-49f8a75031c8fb2efc4824166da75f1473cdab6b.tar.bz2 upstream-49f8a75031c8fb2efc4824166da75f1473cdab6b.zip | |
kernel: bump 5.10 to 5.10.118
Removed upstreamed:
generic-backport/774-v5.15-1-igc-remove-_I_PHY_ID-checking.patch
generic-backport/774-v5.15-2-igc-remove-phy-type-checking.patch
All patches automatically rebased.
Build system: x86_64
Build-tested: ipq806x/R7800
Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit b789a588b1c55fe1df7e2d6ae1c4f84b96a03a95)
Diffstat (limited to 'target/linux/generic/backport-5.10/774-v5.15-2-igc-remove-phy-type-checking.patch')
| -rw-r--r-- | target/linux/generic/backport-5.10/774-v5.15-2-igc-remove-phy-type-checking.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/target/linux/generic/backport-5.10/774-v5.15-2-igc-remove-phy-type-checking.patch b/target/linux/generic/backport-5.10/774-v5.15-2-igc-remove-phy-type-checking.patch deleted file mode 100644 index ad4d1bb0dc..0000000000 --- a/target/linux/generic/backport-5.10/774-v5.15-2-igc-remove-phy-type-checking.patch +++ /dev/null @@ -1,43 +0,0 @@ -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)) { |