diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-02-27 17:07:48 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-03-05 13:19:43 +0100 |
| commit | 1cfbf95393decf047900e1b66b076a030704db20 (patch) | |
| tree | 8087326ea9c0d8885763999944c258fdd5b742f4 /target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch | |
| parent | fc45ae44613b41f7328e81d0999f609dd7e81482 (diff) | |
| download | upstream-1cfbf95393decf047900e1b66b076a030704db20.tar.gz upstream-1cfbf95393decf047900e1b66b076a030704db20.tar.bz2 upstream-1cfbf95393decf047900e1b66b076a030704db20.zip | |
kernel: bump 4.14 to 4.14.104
Refreshed all patches.
Altered patches:
- 332-arc-add-OWRTDTB-section.patch
Compile-tested on: ar71xx, cns3xxx, imx6, x86_64
Runtime-tested on: ar71xx, cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch')
| -rw-r--r-- | target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch b/target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch index c31a540228..f5506a8bdf 100644 --- a/target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch +++ b/target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch @@ -49,7 +49,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> }; --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c -@@ -1045,34 +1045,6 @@ int phylink_ethtool_set_pauseparam(struc +@@ -1054,34 +1054,6 @@ int phylink_ethtool_set_pauseparam(struc } EXPORT_SYMBOL_GPL(phylink_ethtool_set_pauseparam); @@ -86,15 +86,15 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> int ret = -EPROTONOSUPPORT; --- a/drivers/net/phy/sfp-bus.c +++ b/drivers/net/phy/sfp-bus.c -@@ -278,6 +278,7 @@ static int sfp_register_bus(struct sfp_b - } +@@ -279,6 +279,7 @@ static int sfp_register_bus(struct sfp_b + bus->socket_ops->attach(bus->sfp); if (bus->started) bus->socket_ops->start(bus->sfp); + bus->netdev->sfp_bus = bus; bus->registered = true; return 0; } -@@ -292,14 +293,13 @@ static void sfp_unregister_bus(struct sf +@@ -294,14 +295,13 @@ static void sfp_unregister_bus(struct sf if (bus->phydev && ops && ops->disconnect_phy) ops->disconnect_phy(bus->upstream); } @@ -110,7 +110,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> return bus->socket_ops->module_info(bus->sfp, modinfo); } EXPORT_SYMBOL_GPL(sfp_get_module_info); -@@ -307,8 +307,6 @@ EXPORT_SYMBOL_GPL(sfp_get_module_info); +@@ -309,8 +309,6 @@ EXPORT_SYMBOL_GPL(sfp_get_module_info); int sfp_get_module_eeprom(struct sfp_bus *bus, struct ethtool_eeprom *ee, u8 *data) { |