leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Philippe Reynes <tremyfr@gmail.com>
Reviewed-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Philippe Reynes
2017-03-29 08:24:21 +02:00
committed by David S. Miller
parent 6c2257062e
commit 56607b987b
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/net/veth.c
View File

@@ -45,18 +45,13 @@ static struct {
{ "peer_ifindex" }, { "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->base.speed = SPEED_10000;
cmd->advertising = 0; cmd->base.duplex = DUPLEX_FULL;
ethtool_cmd_speed_set(cmd, SPEED_10000); cmd->base.port = PORT_TP;
cmd->duplex = DUPLEX_FULL; cmd->base.autoneg = AUTONEG_DISABLE;
cmd->port = PORT_TP;
cmd->phy_address = 0;
cmd->transceiver = XCVR_INTERNAL;
cmd->autoneg = AUTONEG_DISABLE;
cmd->maxtxpkt = 0;
cmd->maxrxpkt = 0;
return 0; return 0;
} }
@@ -95,12 +90,12 @@ static void veth_get_ethtool_stats(struct net_device *dev,
} }
static const struct ethtool_ops veth_ethtool_ops = { static const struct ethtool_ops veth_ethtool_ops = {
.get_settings = veth_get_settings,
.get_drvinfo = veth_get_drvinfo, .get_drvinfo = veth_get_drvinfo,
.get_link = ethtool_op_get_link, .get_link = ethtool_op_get_link,
.get_strings = veth_get_strings, .get_strings = veth_get_strings,
.get_sset_count = veth_get_sset_count, .get_sset_count = veth_get_sset_count,
.get_ethtool_stats = veth_get_ethtool_stats, .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) static netdev_tx_t veth_xmit(struct sk_buff *skb, struct net_device *dev)