kernel: backport phylink changes from mainline Linux

[openwrt/staging/dangole.git] / target / linux / armsr / patches-6.1 / 701-v6.2-0012-net-dpaa2-mac-move-rtnl_lock-only-around-phylink.patch

diff --git a/target/linux/armsr/patches-6.1/701-v6.2-0012-net-dpaa2-mac-move-rtnl_lock-only-around-phylink.patch b/target/linux/armsr/patches-6.1/701-v6.2-0012-net-dpaa2-mac-move-rtnl_lock-only-around-phylink.patch
index 521c9d4a54d131c6dbdd9673f5fff821c1f29bd2..6a4ba947fcdc3f6ea1f2180e4645c7ad303dcbf1 100644 (file)
--- a/target/linux/armsr/patches-6.1/701-v6.2-0012-net-dpaa2-mac-move-rtnl_lock-only-around-phylink.patch
+++ b/target/linux/armsr/patches-6.1/701-v6.2-0012-net-dpaa2-mac-move-rtnl_lock-only-around-phylink.patch
@@ -62,7 +62,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
        free_percpu(priv->sgt_cache);
 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
 +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
-@@ -428,7 +428,9 @@ int dpaa2_mac_connect(struct dpaa2_mac *
+@@ -427,7 +427,9 @@ int dpaa2_mac_connect(struct dpaa2_mac *
        }
        mac->phylink = phylink;
  
@@ -72,7 +72,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
        if (err) {
                netdev_err(net_dev, "phylink_fwnode_phy_connect() = %d\n", err);
                goto err_phylink_destroy;
-@@ -446,7 +448,10 @@ err_pcs_destroy:
+@@ -445,7 +447,10 @@ err_pcs_destroy:
  
  void dpaa2_mac_disconnect(struct dpaa2_mac *mac)
  {