diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-11-06 18:43:08 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-11-07 19:49:50 +0100 |
| commit | 662fe6a6eeede98ef215284aeb5ff8256ee25f1d (patch) | |
| tree | 9fcc62ee99d8756917bd291f43f2e7f5fb830d3f /target/linux/brcm2708/patches-4.14/950-0292-net-mdiobus-add-unlocked-accessors.patch | |
| parent | 5e8b9624f1791d193e8d5e007ce4c873454f014a (diff) | |
| download | upstream-662fe6a6eeede98ef215284aeb5ff8256ee25f1d.tar.gz upstream-662fe6a6eeede98ef215284aeb5ff8256ee25f1d.tar.bz2 upstream-662fe6a6eeede98ef215284aeb5ff8256ee25f1d.zip | |
kernel: bump 4.14 to 4.14.254
All updated automatically.
Compile-tested on: malta/le, lantiq/xrx200
Runtime-tested on: malta/le, lantiq/xrx200
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/brcm2708/patches-4.14/950-0292-net-mdiobus-add-unlocked-accessors.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-4.14/950-0292-net-mdiobus-add-unlocked-accessors.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/brcm2708/patches-4.14/950-0292-net-mdiobus-add-unlocked-accessors.patch b/target/linux/brcm2708/patches-4.14/950-0292-net-mdiobus-add-unlocked-accessors.patch index 3bf86f612e..866f2643a8 100644 --- a/target/linux/brcm2708/patches-4.14/950-0292-net-mdiobus-add-unlocked-accessors.patch +++ b/target/linux/brcm2708/patches-4.14/950-0292-net-mdiobus-add-unlocked-accessors.patch @@ -19,7 +19,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c -@@ -494,6 +494,55 @@ struct phy_device *mdiobus_scan(struct m +@@ -501,6 +501,55 @@ struct phy_device *mdiobus_scan(struct m EXPORT_SYMBOL(mdiobus_scan); /** @@ -75,7 +75,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> * mdiobus_read_nested - Nested version of the mdiobus_read function * @bus: the mii_bus struct * @addr: the phy address -@@ -513,11 +562,9 @@ int mdiobus_read_nested(struct mii_bus * +@@ -520,11 +569,9 @@ int mdiobus_read_nested(struct mii_bus * BUG_ON(in_interrupt()); mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED); @@ -88,7 +88,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> return retval; } EXPORT_SYMBOL(mdiobus_read_nested); -@@ -539,11 +586,9 @@ int mdiobus_read(struct mii_bus *bus, in +@@ -546,11 +593,9 @@ int mdiobus_read(struct mii_bus *bus, in BUG_ON(in_interrupt()); mutex_lock(&bus->mdio_lock); @@ -101,7 +101,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> return retval; } EXPORT_SYMBOL(mdiobus_read); -@@ -569,11 +614,9 @@ int mdiobus_write_nested(struct mii_bus +@@ -576,11 +621,9 @@ int mdiobus_write_nested(struct mii_bus BUG_ON(in_interrupt()); mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED); @@ -114,7 +114,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> return err; } EXPORT_SYMBOL(mdiobus_write_nested); -@@ -596,11 +639,9 @@ int mdiobus_write(struct mii_bus *bus, i +@@ -603,11 +646,9 @@ int mdiobus_write(struct mii_bus *bus, i BUG_ON(in_interrupt()); mutex_lock(&bus->mdio_lock); @@ -129,7 +129,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> EXPORT_SYMBOL(mdiobus_write); --- a/include/linux/mdio.h +++ b/include/linux/mdio.h -@@ -257,6 +257,9 @@ static inline u16 ethtool_adv_to_mmd_eee +@@ -260,6 +260,9 @@ static inline u16 ethtool_adv_to_mmd_eee return reg; } |