diff options
Diffstat (limited to 'pkgs/patches-linux-5.15/776-v5.16-3-net-mvneta-remove-interface-checks-in-mvneta_validat.patch')
| -rw-r--r-- | pkgs/patches-linux-5.15/776-v5.16-3-net-mvneta-remove-interface-checks-in-mvneta_validat.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/pkgs/patches-linux-5.15/776-v5.16-3-net-mvneta-remove-interface-checks-in-mvneta_validat.patch b/pkgs/patches-linux-5.15/776-v5.16-3-net-mvneta-remove-interface-checks-in-mvneta_validat.patch new file mode 100644 index 0000000..14c34f2 --- /dev/null +++ b/pkgs/patches-linux-5.15/776-v5.16-3-net-mvneta-remove-interface-checks-in-mvneta_validat.patch @@ -0,0 +1,40 @@ +From 10639f59c410911bb4a14e903d109dd426f2858c Mon Sep 17 00:00:00 2001 +From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk> +Date: Wed, 27 Oct 2021 10:03:48 +0100 +Subject: [PATCH 3/4] net: mvneta: remove interface checks in mvneta_validate() + +As phylink checks the interface mode against the supported_interfaces +bitmap, we no longer need to validate the interface mode in the +validation function. Remove this to simplify it. + +Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> +Signed-off-by: David S. Miller <davem@davemloft.net> +--- + drivers/net/ethernet/marvell/mvneta.c | 11 ++--------- + 1 file changed, 2 insertions(+), 9 deletions(-) + +diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c +index 1056b4845ec4..c13d4beb570f 100644 +--- a/drivers/net/ethernet/marvell/mvneta.c ++++ b/drivers/net/ethernet/marvell/mvneta.c +@@ -3860,15 +3860,8 @@ static void mvneta_validate(struct phylink_config *config, + * "Bit 2 Field InBandAnEn In-band Auto-Negotiation enable. ... + * When <PortType> = 1 (1000BASE-X) this field must be set to 1." + */ +- if (phy_interface_mode_is_8023z(state->interface)) { +- if (!phylink_test(state->advertising, Autoneg)) { +- linkmode_zero(supported); +- return; +- } +- } else if (state->interface != PHY_INTERFACE_MODE_NA && +- state->interface != PHY_INTERFACE_MODE_QSGMII && +- state->interface != PHY_INTERFACE_MODE_SGMII && +- !phy_interface_mode_is_rgmii(state->interface)) { ++ if (phy_interface_mode_is_8023z(state->interface) && ++ !phylink_test(state->advertising, Autoneg)) { + linkmode_zero(supported); + return; + } +-- +2.35.1 + |