diff options
| author |   Aaron Conole <aconole@redhat.com> | 2016-10-25 16:12:12 -0400 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-10-29 11:58:51 -0400 |
| commit | 93a205ee98a4881e8bf608e65562c19d45930a93 (patch) | |
| tree | 743d41ba364231ba7474fef64fa1e41b7f0fe1e9 /drivers/net/virtio_net.c | |
| parent | net caif: insert missing spaces in pr_* messages and unbreak multi-line strings (diff) | |
| download | linux-dev-93a205ee98a4881e8bf608e65562c19d45930a93.tar.xz linux-dev-93a205ee98a4881e8bf608e65562c19d45930a93.zip | |
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: Aaron Conole <aconole@redhat.com>
Acked-by: "Michael S. Tsirkin" <mst@redhat.com>
Acked-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/virtio_net.c')
| -rw-r--r-- | drivers/net/virtio_net.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 720809f82a0e..2cafd12a1075 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) |