diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-15 01:30:17 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-15 01:30:17 -0400 |
| commit | 925068dcdc746236264d1877d3d5df656e87882a (patch) | |
| tree | dc7615e1e87a1ca26ee31510c240a1c85fb6f1ad /drivers/net/virtio_net.c | |
| parent | 83aa2e964b9b04effa304aaf3c1090b46812a04b (diff) | |
| parent | 67fbbe1551b24d1bcab8478407f9b8c713d5596e (diff) | |
Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/virtio_net.c')
| -rw-r--r-- | drivers/net/virtio_net.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 4452306d5328..c28d7cb2035b 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c | |||
| @@ -550,7 +550,8 @@ static struct virtio_device_id id_table[] = { | |||
| 550 | }; | 550 | }; |
| 551 | 551 | ||
| 552 | static unsigned int features[] = { | 552 | static unsigned int features[] = { |
| 553 | VIRTIO_NET_F_CSUM, VIRTIO_NET_F_GSO, VIRTIO_NET_F_MAC, | 553 | VIRTIO_NET_F_CSUM, VIRTIO_NET_F_GUEST_CSUM, |
| 554 | VIRTIO_NET_F_GSO, VIRTIO_NET_F_MAC, | ||
| 554 | VIRTIO_NET_F_HOST_TSO4, VIRTIO_NET_F_HOST_UFO, VIRTIO_NET_F_HOST_TSO6, | 555 | VIRTIO_NET_F_HOST_TSO4, VIRTIO_NET_F_HOST_UFO, VIRTIO_NET_F_HOST_TSO6, |
| 555 | VIRTIO_NET_F_HOST_ECN, VIRTIO_F_NOTIFY_ON_EMPTY, | 556 | VIRTIO_NET_F_HOST_ECN, VIRTIO_F_NOTIFY_ON_EMPTY, |
| 556 | }; | 557 | }; |