kernel: backport fixes for realtek r8152

[openwrt/openwrt.git] / target / linux / generic / backport-5.15 / 703-00-v5.16-net-convert-users-of-bitmap_foo-to-linkmode_foo.patch

diff --git a/target/linux/generic/backport-5.15/703-00-v5.16-net-convert-users-of-bitmap_foo-to-linkmode_foo.patch b/target/linux/generic/backport-5.15/703-00-v5.16-net-convert-users-of-bitmap_foo-to-linkmode_foo.patch
index 555e7eaa958c5c24d41b0b9abcf10270f39bdc99..284a6d072255eb40747d67e05d2c326c8ecedf95 100644 (file)
--- a/target/linux/generic/backport-5.15/703-00-v5.16-net-convert-users-of-bitmap_foo-to-linkmode_foo.patch
+++ b/target/linux/generic/backport-5.15/703-00-v5.16-net-convert-users-of-bitmap_foo-to-linkmode_foo.patch
@@ -304,7 +304,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  }
 --- a/drivers/net/dsa/bcm_sf2.c
 +++ b/drivers/net/dsa/bcm_sf2.c
-@@ -686,7 +686,7 @@ static void bcm_sf2_sw_validate(struct d
+@@ -692,7 +692,7 @@ static void bcm_sf2_sw_validate(struct d
            state->interface != PHY_INTERFACE_MODE_GMII &&
            state->interface != PHY_INTERFACE_MODE_INTERNAL &&
            state->interface != PHY_INTERFACE_MODE_MOCA) {
@@ -313,7 +313,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                if (port != core_readl(priv, CORE_IMP0_PRT_ID))
                        dev_err(ds->dev,
                                "Unsupported interface: %d for port %d\n",
-@@ -714,10 +714,8 @@ static void bcm_sf2_sw_validate(struct d
+@@ -720,10 +720,8 @@ static void bcm_sf2_sw_validate(struct d
        phylink_set(mask, 100baseT_Half);
        phylink_set(mask, 100baseT_Full);
  
@@ -637,7 +637,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static void macb_usx_pcs_link_up(struct phylink_pcs *pcs, unsigned int mode,
 --- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c
 +++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
-@@ -968,7 +968,7 @@ static void enetc_pl_mac_validate(struct
+@@ -965,7 +965,7 @@ static void enetc_pl_mac_validate(struct
            state->interface != PHY_INTERFACE_MODE_2500BASEX &&
            state->interface != PHY_INTERFACE_MODE_USXGMII &&
            !phy_interface_mode_is_rgmii(state->interface)) {
@@ -646,7 +646,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                return;
        }
  
-@@ -991,10 +991,8 @@ static void enetc_pl_mac_validate(struct
+@@ -988,10 +988,8 @@ static void enetc_pl_mac_validate(struct
                phylink_set(mask, 2500baseX_Full);
        }
  
@@ -726,7 +726,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
         * to advertise both, only report advertising at 2500BaseX.
 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
 +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
-@@ -6347,15 +6347,14 @@ static void mvpp2_phylink_validate(struc
+@@ -6352,15 +6352,14 @@ static void mvpp2_phylink_validate(struc
                goto empty_set;
        }
  
@@ -901,7 +901,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  static void axienet_mac_pcs_get_state(struct phylink_config *config,
 --- a/drivers/net/pcs/pcs-xpcs.c
 +++ b/drivers/net/pcs/pcs-xpcs.c
-@@ -646,7 +646,7 @@ void xpcs_validate(struct dw_xpcs *xpcs,
+@@ -637,7 +637,7 @@ void xpcs_validate(struct dw_xpcs *xpcs,
        if (state->interface == PHY_INTERFACE_MODE_NA)
                return;