Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1280345

[PATCH net-next v3 08/17] net: macvlan: use __ethtool_get_ksettings

Show all headers | View raw

From: David Decotigny <decot@googlers.com>

Signed-off-by: David Decotigny <decot@googlers.com>
---
 drivers/net/macvlan.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 06c8bfe..a95b793 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -940,12 +940,12 @@ static void macvlan_ethtool_get_drvinfo(struct net_device *dev,
 	strlcpy(drvinfo->version, "0.1", sizeof(drvinfo->version));
 }
 
-static int macvlan_ethtool_get_settings(struct net_device *dev,
-					struct ethtool_cmd *cmd)
+static int macvlan_ethtool_get_ksettings(struct net_device *dev,
+					 struct ethtool_ksettings *cmd)
 {
 	const struct macvlan_dev *vlan = netdev_priv(dev);
 
-	return __ethtool_get_settings(vlan->lowerdev, cmd);
+	return __ethtool_get_ksettings(vlan->lowerdev, cmd);
 }
 
 static netdev_features_t macvlan_fix_features(struct net_device *dev,
@@ -1020,7 +1020,7 @@ static int macvlan_dev_get_iflink(const struct net_device *dev)
 
 static const struct ethtool_ops macvlan_ethtool_ops = {
 	.get_link		= ethtool_op_get_link,
-	.get_settings		= macvlan_ethtool_get_settings,
+	.get_ksettings		= macvlan_ethtool_get_ksettings,
 	.get_drvinfo		= macvlan_ethtool_get_drvinfo,
 };
 
-- 
2.6.0.rc2.230.g3dd15c0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH net-next v3 00/17] RFC: new ETHTOOL_GSETTINGS/SSETTINGS API David Decotigny <ddecotig@gmail.com> - 2015-11-30 23:10 +0100
  [PATCH net-next v3 11/17] net: rdma: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-11-30 23:10 +0100
  [PATCH net-next v3 12/17] net: 8021q: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-11-30 23:10 +0100
  [PATCH net-next v3 14/17] net: core: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-11-30 23:10 +0100
  [PATCH net-next v3 13/17] net: bridge: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-11-30 23:10 +0100
  [PATCH net-next v3 01/17] net: usnic: remove unused call to ethtool_ops::get_settings David Decotigny <ddecotig@gmail.com> - 2015-11-30 23:10 +0100
  [PATCH net-next v3 08/17] net: macvlan: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-11-30 23:10 +0100
  [PATCH net-next v3 07/17] net: ipvlan: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-11-30 23:10 +0100
  [PATCH net-next v3 02/17] net: usnic: use __ethtool_get_settings David Decotigny <ddecotig@gmail.com> - 2015-11-30 23:20 +0100
  [PATCH net-next v3 05/17] net: usnic: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-11-30 23:20 +0100
  [PATCH net-next v3 06/17] net: bonding: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-11-30 23:20 +0100
  [PATCH net-next v3 10/17] net: fcoe: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-11-30 23:20 +0100
  [PATCH net-next v3 04/17] tx4939: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-11-30 23:20 +0100
    Re: [PATCH net-next v3 04/17] tx4939: use __ethtool_get_ksettings Ralf Baechle <ralf@linux-mips.org> - 2015-12-01 01:00 +0100
  [PATCH net-next v3 09/17] net: team: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-11-30 23:20 +0100
  Re: [PATCH net-next v3 03/17] net: ethtool: add new  ETHTOOL_GSETTINGS/SSETTINGS API Ben Hutchings <ben@decadent.org.uk> - 2015-12-01 03:00 +0100
  Re: [PATCH net-next v3 03/17] net: ethtool: add new  ETHTOOL_GSETTINGS/SSETTINGS API David Miller <davem@davemloft.net> - 2015-12-02 04:20 +0100
    Re: [PATCH net-next v3 03/17] net: ethtool: add new  ETHTOOL_GSETTINGS/SSETTINGS API David Decotigny <ddecotig@gmail.com> - 2015-12-02 07:10 +0100
      Re: [PATCH net-next v3 03/17] net: ethtool: add new  ETHTOOL_GSETTINGS/SSETTINGS API David Miller <davem@davemloft.net> - 2015-12-02 18:40 +0100

csiph-web