kernel: backport fixes for realtek r8152

[openwrt/openwrt.git] / target / linux / generic / backport-5.15 / 703-15-v5.18-net-phy-phylink-fix-DSA-mac_select_pcs-introduction.patch

diff --git a/target/linux/generic/backport-5.15/703-15-v5.18-net-phy-phylink-fix-DSA-mac_select_pcs-introduction.patch b/target/linux/generic/backport-5.15/703-15-v5.18-net-phy-phylink-fix-DSA-mac_select_pcs-introduction.patch
index 4ab90fafe1da76a099e8c6bfbe642ee1ddd3a47a..924d0e954a9079657119ebc67df7c780f42ed8d2 100644 (file)
--- a/target/linux/generic/backport-5.15/703-15-v5.18-net-phy-phylink-fix-DSA-mac_select_pcs-introduction.patch
+++ b/target/linux/generic/backport-5.15/703-15-v5.18-net-phy-phylink-fix-DSA-mac_select_pcs-introduction.patch
@@ -66,7 +66,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
            phy_interface_empty(config->supported_interfaces)) {
                dev_err(config->dev,
                        "phylink: error: empty supported_interfaces but mac_select_pcs() method present\n");
-@@ -1220,6 +1227,7 @@ struct phylink *phylink_create(struct ph
+@@ -1221,6 +1228,7 @@ struct phylink *phylink_create(struct ph
                return ERR_PTR(-EINVAL);
        }
  
@@ -76,7 +76,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
        if (iface == PHY_INTERFACE_MODE_MOCA)
 --- a/net/dsa/port.c
 +++ b/net/dsa/port.c
-@@ -1017,8 +1017,8 @@ dsa_port_phylink_mac_select_pcs(struct p
+@@ -1033,8 +1033,8 @@ dsa_port_phylink_mac_select_pcs(struct p
                                phy_interface_t interface)
  {
        struct dsa_port *dp = container_of(config, struct dsa_port, pl_config);