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

net: virtio_net: 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>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b5bacf86

drivers/net/virtio_net.c

+29 −19
Original line number Diff line number Diff line
@@ -1636,47 +1636,57 @@ static void virtnet_get_channels(struct net_device *dev, 
}



/* Check if the user is trying to change anything besides speed/duplex */

static bool virtnet_validate_ethtool_cmd(const struct ethtool_cmd *cmd)

static bool

virtnet_validate_ethtool_cmd(const struct ethtool_link_ksettings *cmd)

{

	struct ethtool_cmd diff1 = *cmd;

	struct ethtool_cmd diff2 = {};

	struct ethtool_link_ksettings diff1 = *cmd;

	struct ethtool_link_ksettings diff2 = {};



	/* cmd is always set so we need to clear it, validate the port type

	 * and also without autonegotiation we can ignore advertising

	 */

	ethtool_cmd_speed_set(&diff1, 0);

	diff2.port = PORT_OTHER;

	diff1.advertising = 0;

	diff1.duplex = 0;

	diff1.cmd = 0;

	diff1.base.speed = 0;

	diff2.base.port = PORT_OTHER;

	ethtool_link_ksettings_zero_link_mode(&diff1, advertising);

	diff1.base.duplex = 0;

	diff1.base.cmd = 0;

	diff1.base.link_mode_masks_nwords = 0;



	return !memcmp(&diff1, &diff2, sizeof(diff1));

	return !memcmp(&diff1.base, &diff2.base, sizeof(diff1.base)) &&

		bitmap_empty(diff1.link_modes.supported,

			     __ETHTOOL_LINK_MODE_MASK_NBITS) &&

		bitmap_empty(diff1.link_modes.advertising,

			     __ETHTOOL_LINK_MODE_MASK_NBITS) &&

		bitmap_empty(diff1.link_modes.lp_advertising,

			     __ETHTOOL_LINK_MODE_MASK_NBITS);

}



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

static int virtnet_set_link_ksettings(struct net_device *dev,

				      const struct ethtool_link_ksettings *cmd)

{

	struct virtnet_info *vi = netdev_priv(dev);

	u32 speed;



	speed = ethtool_cmd_speed(cmd);

	speed = cmd->base.speed;

	/* don't allow custom speed and duplex */

	if (!ethtool_validate_speed(speed) ||

	    !ethtool_validate_duplex(cmd->duplex) ||

	    !ethtool_validate_duplex(cmd->base.duplex) ||

	    !virtnet_validate_ethtool_cmd(cmd))

		return -EINVAL;

	vi->speed = speed;

	vi->duplex = cmd->duplex;

	vi->duplex = cmd->base.duplex;



	return 0;

}



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

static int virtnet_get_link_ksettings(struct net_device *dev,

				      struct ethtool_link_ksettings *cmd)

{

	struct virtnet_info *vi = netdev_priv(dev);



	ethtool_cmd_speed_set(cmd, vi->speed);

	cmd->duplex = vi->duplex;

	cmd->port = PORT_OTHER;

	cmd->base.speed = vi->speed;

	cmd->base.duplex = vi->duplex;

	cmd->base.port = PORT_OTHER;



	return 0;

}
@@ -1696,8 +1706,8 @@ static const struct ethtool_ops virtnet_ethtool_ops = { 
	.set_channels = virtnet_set_channels,

	.get_channels = virtnet_get_channels,

	.get_ts_info = ethtool_op_get_ts_info,

	.get_settings = virtnet_get_settings,

	.set_settings = virtnet_set_settings,

	.get_link_ksettings = virtnet_get_link_ksettings,

	.set_link_ksettings = virtnet_set_link_ksettings,

};



static void virtnet_freeze_down(struct virtio_device *vdev)