kernel: add support for kernel 5.4

[openwrt/staging/jogo.git] / target / linux / generic / pending-5.4 / 749-net-phylink-split-phylink_sfp_module_insert.patch

diff --git a/target/linux/generic/pending-5.4/749-net-phylink-split-phylink_sfp_module_insert.patch b/target/linux/generic/pending-5.4/749-net-phylink-split-phylink_sfp_module_insert.patch
index 87d70d1434b831872a342604373e74860a0c6e75..b840d71c43db29c887a4af36a2ae33ce391117a7 100644 (file)
--- a/target/linux/generic/pending-5.4/749-net-phylink-split-phylink_sfp_module_insert.patch
+++ b/target/linux/generic/pending-5.4/749-net-phylink-split-phylink_sfp_module_insert.patch
@@ -13,7 +13,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
 
 --- a/drivers/net/phy/phylink.c
 +++ b/drivers/net/phy/phylink.c
-@@ -1633,25 +1633,21 @@ static void phylink_sfp_detach(void *ups
+@@ -1688,25 +1688,21 @@ static void phylink_sfp_detach(void *ups
        pl->netdev->sfp_bus = NULL;
  }
  
@@ -46,7 +46,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
        config.interface = PHY_INTERFACE_MODE_NA;
        config.speed = SPEED_UNKNOWN;
        config.duplex = DUPLEX_UNKNOWN;
-@@ -1666,8 +1662,6 @@ static int phylink_sfp_module_insert(voi
+@@ -1721,8 +1717,6 @@ static int phylink_sfp_module_insert(voi
                return ret;
        }
  
@@ -54,30 +54,30 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
 -
        iface = sfp_select_interface(pl->sfp_bus, config.advertising);
        if (iface == PHY_INTERFACE_MODE_NA) {
-               netdev_err(pl->netdev,
-@@ -1677,18 +1671,18 @@ static int phylink_sfp_module_insert(voi
+               phylink_err(pl,
+@@ -1732,18 +1726,18 @@ static int phylink_sfp_module_insert(voi
        }
  
        config.interface = iface;
 +      linkmode_copy(support1, support);
        ret = phylink_validate(pl, support1, &config);
        if (ret) {
-               netdev_err(pl->netdev, "validation of %s/%s with support %*pb failed: %d\n",
--                         phylink_an_mode_str(MLO_AN_INBAND),
-+                         phylink_an_mode_str(mode),
-                          phy_modes(config.interface),
-                          __ETHTOOL_LINK_MODE_MASK_NBITS, support, ret);
+               phylink_err(pl, "validation of %s/%s with support %*pb failed: %d\n",
+-                          phylink_an_mode_str(MLO_AN_INBAND),
++                          phylink_an_mode_str(mode),
+                           phy_modes(config.interface),
+                           __ETHTOOL_LINK_MODE_MASK_NBITS, support, ret);
                return ret;
        }
  
-       netdev_dbg(pl->netdev, "requesting link mode %s/%s with support %*pb\n",
--                 phylink_an_mode_str(MLO_AN_INBAND),
--                 phy_modes(config.interface),
-+                 phylink_an_mode_str(mode), phy_modes(config.interface),
-                  __ETHTOOL_LINK_MODE_MASK_NBITS, support);
+       phylink_dbg(pl, "requesting link mode %s/%s with support %*pb\n",
+-                  phylink_an_mode_str(MLO_AN_INBAND),
+-                  phy_modes(config.interface),
++                  phylink_an_mode_str(mode), phy_modes(config.interface),
+                   __ETHTOOL_LINK_MODE_MASK_NBITS, support);
  
        if (phy_interface_mode_is_8023z(iface) && pl->phydev)
-@@ -1701,15 +1695,15 @@ static int phylink_sfp_module_insert(voi
+@@ -1756,15 +1750,15 @@ static int phylink_sfp_module_insert(voi
                linkmode_copy(pl->link_config.advertising, config.advertising);
        }
  
@@ -90,13 +90,13 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
  
                changed = true;
  
-               netdev_info(pl->netdev, "switched to %s/%s link mode\n",
--                          phylink_an_mode_str(MLO_AN_INBAND),
-+                          phylink_an_mode_str(mode),
-                           phy_modes(config.interface));
+               phylink_info(pl, "switched to %s/%s link mode\n",
+-                           phylink_an_mode_str(MLO_AN_INBAND),
++                           phylink_an_mode_str(mode),
+                            phy_modes(config.interface));
        }
  
-@@ -1722,6 +1716,21 @@ static int phylink_sfp_module_insert(voi
+@@ -1777,6 +1771,21 @@ static int phylink_sfp_module_insert(voi
        return ret;
  }