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

Commit 93a205ee authored by Aaron Conole's avatar Aaron Conole Committed by David S. Miller
Browse files

virtio-net: Update the mtu code to match virtio spec 



The virtio committee recently ratified a change, VIRTIO-152, which
defines the mtu field to be 'max' MTU, not simply desired MTU.

This commit brings the virtio-net device in compliance with VIRTIO-152.

Additionally, drop the max_mtu branch - it cannot be taken since the u16
returned by virtio_cread16 will never exceed the initial value of
max_mtu.

Signed-off-by: default avatarAaron Conole <aconole@redhat.com>
Acked-by: default avatar"Michael S. Tsirkin" <mst@redhat.com>
Acked-by: default avatarJarod Wilson <jarod@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b09edbd0

drivers/net/virtio_net.c

+4 −2
Original line number Diff line number Diff line
@@ -1870,10 +1870,12 @@ static int virtnet_probe(struct virtio_device *vdev) 
		mtu = virtio_cread16(vdev,

				     offsetof(struct virtio_net_config,

					      mtu));

		if (mtu < dev->min_mtu || mtu > dev->max_mtu)

		if (mtu < dev->min_mtu) {

			__virtio_clear_bit(vdev, VIRTIO_NET_F_MTU);

		else

		} else {

			dev->mtu = mtu;

			dev->max_mtu = mtu;

		}

	}



	if (vi->any_header_sg)