Commit 64ffa39d authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

virtio_net: use LE accessors for speed/duplex 



Speed and duplex config fields depend on VIRTIO_NET_F_SPEED_DUPLEX
which being 63>31 depends on VIRTIO_F_VERSION_1.

Accordingly, use LE accessors for these fields.

Reported-by: default avatarCornelia Huck <cohuck@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 83eb9db9

drivers/net/virtio_net.c

+5 −4
Original line number Diff line number Diff line
@@ -2264,12 +2264,13 @@ static void virtnet_update_settings(struct virtnet_info *vi) 
	if (!virtio_has_feature(vi->vdev, VIRTIO_NET_F_SPEED_DUPLEX))

		return;



	speed = virtio_cread32(vi->vdev, offsetof(struct virtio_net_config,

						  speed));

	virtio_cread_le(vi->vdev, struct virtio_net_config, speed, &speed);



	if (ethtool_validate_speed(speed))

		vi->speed = speed;

	duplex = virtio_cread8(vi->vdev, offsetof(struct virtio_net_config,

						  duplex));



	virtio_cread_le(vi->vdev, struct virtio_net_config, duplex, &duplex);



	if (ethtool_validate_duplex(duplex))

		vi->duplex = duplex;

}

include/uapi/linux/virtio_net.h

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ struct virtio_net_config { 
	 * speed, in units of 1Mb. All values 0 to INT_MAX are legal.

	 * Any other value stands for unknown.

	 */

	__virtio32 speed;

	__le32 speed;

	/*

	 * 0x00 - half duplex

	 * 0x01 - full duplex

CRA Git | Maintained and supported by SUSTech CRA and CCSE