UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: 8021q: use __ethtool_get_ksettings 

Signed-off-by: David Decotigny <decot@googlers.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David Decotigny 2016-02-24 10:58:08 -08:00 committed by David S. Miller
parent 17605b961f
commit 577097981d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/8021q/vlan_dev.c
View File

@ -621,12 +621,12 @@ static netdev_features_t vlan_dev_fix_features(struct net_device *dev,
return features; return features;
} }
static int vlan_ethtool_get_settings(struct net_device *dev, static int vlan_ethtool_get_link_ksettings(struct net_device *dev,
struct ethtool_cmd *cmd) struct ethtool_link_ksettings *cmd)
{ {
const struct vlan_dev_priv *vlan = vlan_dev_priv(dev); const struct vlan_dev_priv *vlan = vlan_dev_priv(dev);
return __ethtool_get_settings(vlan->real_dev, cmd); return __ethtool_get_link_ksettings(vlan->real_dev, cmd);
} }
static void vlan_ethtool_get_drvinfo(struct net_device *dev, 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 = { static const struct ethtool_ops vlan_ethtool_ops = {
.get_settings = vlan_ethtool_get_settings, .get_link_ksettings = vlan_ethtool_get_link_ksettings,
.get_drvinfo = vlan_ethtool_get_drvinfo, .get_drvinfo = vlan_ethtool_get_drvinfo,
.get_link = ethtool_op_get_link, .get_link = ethtool_op_get_link,
.get_ts_info = vlan_ethtool_get_ts_info, .get_ts_info = vlan_ethtool_get_ts_info,