diff options
author | David S. Miller <davem@davemloft.net> | 2008-12-02 18:05:06 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-02 18:05:06 -0500 |
commit | 68024541e2e5a8f35e281daaa5068a29e2a538a5 (patch) | |
tree | 81345f6259fc90f12aa15569c3000cf4b829247b | |
parent | ca17584bf2ad1b1e37a5c0e4386728cc5fc9dabc (diff) | |
parent | 39da5814db81e8fe9782ae5ea24c0fdfcf2adc96 (diff) |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
-rw-r--r-- | drivers/net/virtio_net.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index e6b5d6ef9ea8..71ca29cc184d 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c | |||
@@ -613,6 +613,17 @@ static struct ethtool_ops virtnet_ethtool_ops = { | |||
613 | .set_tso = ethtool_op_set_tso, | 613 | .set_tso = ethtool_op_set_tso, |
614 | }; | 614 | }; |
615 | 615 | ||
616 | #define MIN_MTU 68 | ||
617 | #define MAX_MTU 65535 | ||
618 | |||
619 | static int virtnet_change_mtu(struct net_device *dev, int new_mtu) | ||
620 | { | ||
621 | if (new_mtu < MIN_MTU || new_mtu > MAX_MTU) | ||
622 | return -EINVAL; | ||
623 | dev->mtu = new_mtu; | ||
624 | return 0; | ||
625 | } | ||
626 | |||
616 | static int virtnet_probe(struct virtio_device *vdev) | 627 | static int virtnet_probe(struct virtio_device *vdev) |
617 | { | 628 | { |
618 | int err; | 629 | int err; |
@@ -628,6 +639,7 @@ static int virtnet_probe(struct virtio_device *vdev) | |||
628 | dev->open = virtnet_open; | 639 | dev->open = virtnet_open; |
629 | dev->stop = virtnet_close; | 640 | dev->stop = virtnet_close; |
630 | dev->hard_start_xmit = start_xmit; | 641 | dev->hard_start_xmit = start_xmit; |
642 | dev->change_mtu = virtnet_change_mtu; | ||
631 | dev->features = NETIF_F_HIGHDMA; | 643 | dev->features = NETIF_F_HIGHDMA; |
632 | #ifdef CONFIG_NET_POLL_CONTROLLER | 644 | #ifdef CONFIG_NET_POLL_CONTROLLER |
633 | dev->poll_controller = virtnet_netpoll; | 645 | dev->poll_controller = virtnet_netpoll; |