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

Commit 56607b98 authored by Philippe Reynes's avatar Philippe Reynes Committed by David S. Miller
Browse files

net: veth: use new api ethtool_{get|set}_link_ksettings 



The ethtool api {get|set}_settings is deprecated.
We move this driver to new api {get|set}_link_ksettings.

Signed-off-by: default avatarPhilippe Reynes <tremyfr@gmail.com>
Reviewed-by: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6c225706

drivers/net/veth.c

+7 −12
Original line number Diff line number Diff line
@@ -45,18 +45,13 @@ static struct { 
	{ "peer_ifindex" },

};



static int veth_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)

static int veth_get_link_ksettings(struct net_device *dev,

				   struct ethtool_link_ksettings *cmd)

{

	cmd->supported		= 0;

	cmd->advertising	= 0;

	ethtool_cmd_speed_set(cmd, SPEED_10000);

	cmd->duplex		= DUPLEX_FULL;

	cmd->port		= PORT_TP;

	cmd->phy_address	= 0;

	cmd->transceiver	= XCVR_INTERNAL;

	cmd->autoneg		= AUTONEG_DISABLE;

	cmd->maxtxpkt		= 0;

	cmd->maxrxpkt		= 0;

	cmd->base.speed		= SPEED_10000;

	cmd->base.duplex	= DUPLEX_FULL;

	cmd->base.port		= PORT_TP;

	cmd->base.autoneg	= AUTONEG_DISABLE;

	return 0;

}
@@ -95,12 +90,12 @@ static void veth_get_ethtool_stats(struct net_device *dev, 
}



static const struct ethtool_ops veth_ethtool_ops = {

	.get_settings		= veth_get_settings,

	.get_drvinfo		= veth_get_drvinfo,

	.get_link		= ethtool_op_get_link,

	.get_strings		= veth_get_strings,

	.get_sset_count		= veth_get_sset_count,

	.get_ethtool_stats	= veth_get_ethtool_stats,

	.get_link_ksettings	= veth_get_link_ksettings,

};



static netdev_tx_t veth_xmit(struct sk_buff *skb, struct net_device *dev)