mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-12-07 05:04:00 -05:00
813ecda1f3
Backport phylink patches for PCS/PHY caps OPs. This makes it easier to align future generic PCS patch and permit supporting special PHY that needs specific tune if "in-band" mode is enabled (for example Aeonsemi PHYs) This is also mainly using the upstream version of the Mediatek patch 739-net-add-negotiation-of-in-band-capabilities. All affected patch automatically refreshed. Link: https://github.com/openwrt/openwrt/pull/20461 Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
From 92abfcb4ced482afbe65d18980e6734fe1e62a34 Mon Sep 17 00:00:00 2001
|
|
From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
|
|
Date: Fri, 8 Nov 2024 16:01:50 +0000
|
|
Subject: [PATCH 2/5] net: phylink: move MLO_AN_FIXED resolve handling to if()
|
|
statement
|
|
|
|
The switch() statement doesn't sit very well with the preceeding if()
|
|
statements, and results in excessive indentation that spoils code
|
|
readability. Begin cleaning this up by converting the MLO_AN_FIXED case
|
|
to an if() statement.
|
|
|
|
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
|
|
Link: https://patch.msgid.link/E1t9RQk-002Fen-1A@rmk-PC.armlinux.org.uk
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/phy/phylink.c | 8 +++-----
|
|
1 file changed, 3 insertions(+), 5 deletions(-)
|
|
|
|
--- a/drivers/net/phy/phylink.c
|
|
+++ b/drivers/net/phy/phylink.c
|
|
@@ -1480,6 +1480,9 @@ static void phylink_resolve(struct work_
|
|
} else if (pl->link_failed) {
|
|
link_state.link = false;
|
|
retrigger = true;
|
|
+ } else if (pl->cur_link_an_mode == MLO_AN_FIXED) {
|
|
+ phylink_get_fixed_state(pl, &link_state);
|
|
+ mac_config = link_state.link;
|
|
} else {
|
|
switch (pl->cur_link_an_mode) {
|
|
case MLO_AN_PHY:
|
|
@@ -1487,11 +1490,6 @@ static void phylink_resolve(struct work_
|
|
mac_config = link_state.link;
|
|
break;
|
|
|
|
- case MLO_AN_FIXED:
|
|
- phylink_get_fixed_state(pl, &link_state);
|
|
- mac_config = link_state.link;
|
|
- break;
|
|
-
|
|
case MLO_AN_INBAND:
|
|
phylink_mac_pcs_get_state(pl, &link_state);
|
|
|