Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1508437

[PATCH] virtio-net: Update the mtu code to match virtio spec

Show all headers | View raw

From: Aaron Conole <aconole@bytheb.org>

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.

Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Aaron Conole <aconole@redhat.com>
---
 drivers/net/virtio_net.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 720809f..2cafd12 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -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)
-- 
2.7.4

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] virtio-net: Update the mtu code to match virtio spec Aaron Conole <aconole@redhat.com> - 2016-10-25 18:40 +0200
  Re: [PATCH] virtio-net: Update the mtu code to match virtio spec "Michael S. Tsirkin" <mst@redhat.com> - 2016-10-25 18:50 +0200
  Re: [PATCH] virtio-net: Update the mtu code to match virtio spec Jarod Wilson <jarod@redhat.com> - 2016-10-25 19:20 +0200
  Re: [PATCH] virtio-net: Update the mtu code to match virtio spec Aaron Conole <aconole@redhat.com> - 2016-10-25 22:10 +0200
    Re: [PATCH] virtio-net: Update the mtu code to match virtio spec Aaron Conole <aconole@redhat.com> - 2016-10-25 22:20 +0200

csiph-web