Loading net/8021q/vlan_dev.c +4 −4 Original line number Original line Diff line number Diff line Loading @@ -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, Loading Loading @@ -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, Loading Loading
net/8021q/vlan_dev.c +4 −4 Original line number Original line Diff line number Diff line Loading @@ -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, Loading Loading @@ -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, Loading