Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1312620
| From | David Decotigny <ddecotig@gmail.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH net-next v6 14/19] net: 8021q: use __ethtool_get_ksettings |
| Date | 2016-01-20 01:50 +0100 |
| Message-ID | <qSP8g-73P-85@gated-at.bofh.it> (permalink) |
| References | <qSP8d-73P-5@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
From: David Decotigny <decot@googlers.com>
Signed-off-by: David Decotigny <decot@googlers.com>
---
net/8021q/vlan_dev.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index ad5e2fd..d4a6131 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -621,12 +621,12 @@ static netdev_features_t vlan_dev_fix_features(struct net_device *dev,
return features;
}
-static int vlan_ethtool_get_settings(struct net_device *dev,
- struct ethtool_cmd *cmd)
+static int vlan_ethtool_get_ksettings(struct net_device *dev,
+ struct ethtool_ksettings *cmd)
{
const struct vlan_dev_priv *vlan = vlan_dev_priv(dev);
- return __ethtool_get_settings(vlan->real_dev, cmd);
+ return __ethtool_get_ksettings(vlan->real_dev, cmd);
}
static void vlan_ethtool_get_drvinfo(struct net_device *dev,
@@ -741,7 +741,7 @@ static int vlan_dev_get_iflink(const struct net_device *dev)
}
static const struct ethtool_ops vlan_ethtool_ops = {
- .get_settings = vlan_ethtool_get_settings,
+ .get_ksettings = vlan_ethtool_get_ksettings,
.get_drvinfo = vlan_ethtool_get_drvinfo,
.get_link = ethtool_op_get_link,
.get_ts_info = vlan_ethtool_get_ts_info,
--
2.7.0.rc3.207.g0ac5344
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH net-next v6 00/19] new ETHTOOL_GSETTINGS/SSETTINGS API David Decotigny <ddecotig@gmail.com> - 2016-01-20 01:50 +0100 [PATCH net-next v6 03/19] net: usnic: remove unused call to ethtool_ops::get_settings David Decotigny <ddecotig@gmail.com> - 2016-01-20 01:50 +0100 [PATCH net-next v6 14/19] net: 8021q: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2016-01-20 01:50 +0100 [PATCH net-next v6 10/19] net: macvlan: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2016-01-20 01:50 +0100 [PATCH net-next v6 12/19] net: fcoe: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2016-01-20 01:50 +0100 [PATCH net-next v6 08/19] net: bonding: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2016-01-20 02:00 +0100
csiph-web