kernel: Update kernel 5.4 to version 5.4.50

[openwrt/openwrt.git] / target / linux / generic / backport-5.4 / 737-v5.5-net-phy-add-core-phylib-sfp-support.patch

diff --git a/target/linux/generic/backport-5.4/737-v5.5-net-phy-add-core-phylib-sfp-support.patch b/target/linux/generic/backport-5.4/737-v5.5-net-phy-add-core-phylib-sfp-support.patch
index 23230abfbbb3ce5789903ddfb663773b05141f25..6ee99b4791d886d6935f51e219c358268a04fb0b 100644 (file)
--- a/target/linux/generic/backport-5.4/737-v5.5-net-phy-add-core-phylib-sfp-support.patch
+++ b/target/linux/generic/backport-5.4/737-v5.5-net-phy-add-core-phylib-sfp-support.patch
@@ -54,7 +54,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
  #include <linux/mdio.h>
  #include <linux/io.h>
  #include <linux/uaccess.h>
-@@ -1183,6 +1184,65 @@ phy_standalone_show(struct device *dev,
+@@ -1185,6 +1186,65 @@ phy_standalone_show(struct device *dev,
  static DEVICE_ATTR_RO(phy_standalone);
  
  /**
@@ -120,7 +120,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
   * phy_attach_direct - attach a network device to a given PHY device pointer
   * @dev: network device to attach
   * @phydev: Pointer to phy_device to attach
-@@ -1259,6 +1319,9 @@ int phy_attach_direct(struct net_device
+@@ -1261,6 +1321,9 @@ int phy_attach_direct(struct net_device
                dev->phydev = phydev;
        }
  
@@ -130,7 +130,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
        /* Some Ethernet drivers try to connect to a PHY device before
         * calling register_netdevice() -> netdev_register_kobject() and
         * does the dev->dev.kobj initialization. Here we only check for
-@@ -2287,6 +2350,9 @@ static int phy_remove(struct device *dev
+@@ -2289,6 +2352,9 @@ static int phy_remove(struct device *dev
        phydev->state = PHY_DOWN;
        mutex_unlock(&phydev->lock);