239dff6697
The lantiq patch 0028-NET-lantiq-various-etop-fixes.patch and sunxi
patch 0051-stmmac-form-4-11.patch no longer applied after applying the
the "generalize napi_complete_done()" patch.
Update them so they apply, and refresh patches while at it.
Fixes: 9aeb7ce8dc ("generic: net: generalize napi_complete_done")
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
From: Russell King <rmk+kernel@arm.linux.org.uk>
|
|
Date: Thu, 1 Oct 2015 23:32:39 +0100
|
|
Subject: [PATCH] net: mvneta: add module EEPROM reading support
|
|
|
|
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
|
|
---
|
|
|
|
--- a/drivers/net/ethernet/marvell/mvneta.c
|
|
+++ b/drivers/net/ethernet/marvell/mvneta.c
|
|
@@ -3949,6 +3949,22 @@ static u16 mvneta_select_queue(struct ne
|
|
}
|
|
|
|
|
|
+static int mvneta_ethtool_get_module_info(struct net_device *dev,
|
|
+ struct ethtool_modinfo *modinfo)
|
|
+{
|
|
+ struct mvneta_port *pp = netdev_priv(dev);
|
|
+
|
|
+ return phylink_ethtool_get_module_info(pp->phylink, modinfo);
|
|
+}
|
|
+
|
|
+static int mvneta_ethtool_get_module_eeprom(struct net_device *dev,
|
|
+ struct ethtool_eeprom *ee, u8 *buf)
|
|
+{
|
|
+ struct mvneta_port *pp = netdev_priv(dev);
|
|
+
|
|
+ return phylink_ethtool_get_module_eeprom(pp->phylink, ee, buf);
|
|
+}
|
|
+
|
|
static int mvneta_ethtool_get_eee(struct net_device *dev,
|
|
struct ethtool_eee *eee)
|
|
{
|
|
@@ -4022,6 +4038,8 @@ const struct ethtool_ops mvneta_eth_tool
|
|
.set_rxfh = mvneta_ethtool_set_rxfh,
|
|
.get_link_ksettings = mvneta_ethtool_get_link_ksettings,
|
|
.set_link_ksettings = mvneta_ethtool_set_link_ksettings,
|
|
+ .get_module_info = mvneta_ethtool_get_module_info,
|
|
+ .get_module_eeprom = mvneta_ethtool_get_module_eeprom,
|
|
.get_eee = mvneta_ethtool_get_eee,
|
|
.set_eee = mvneta_ethtool_set_eee,
|
|
};
|