Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85f95819 authored by David Decotigny's avatar David Decotigny Committed by David S. Miller
Browse files

net: macvlan: use __ethtool_get_ksettings 



Signed-off-by: default avatarDavid Decotigny <decot@googlers.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 314d10d7

drivers/net/macvlan.c

+4 −4
Original line number Diff line number Diff line
@@ -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_link_ksettings(struct net_device *dev,

					      struct ethtool_link_ksettings *cmd)

{

	const struct macvlan_dev *vlan = netdev_priv(dev);



	return __ethtool_get_settings(vlan->lowerdev, cmd);

	return __ethtool_get_link_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_link_ksettings	= macvlan_ethtool_get_link_ksettings,

	.get_drvinfo		= macvlan_ethtool_get_drvinfo,

};