kernel: bump 4.14 to 4.14.104
[openwrt/staging/wigyori.git] / target / linux / mvebu / patches-4.14 / 408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch
index c31a540..f5506a8 100644 (file)
@@ -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)
  {