diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-21 05:02:45 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-21 05:02:45 -0400 |
| commit | e27772b48df91a954a74b1411b57d83b945a58c7 (patch) | |
| tree | ebd4a434d9e3cbd0844109e4469f91daac581b59 /drivers/net/virtio_net.c | |
| parent | d092633bff3b19faffc480fe9810805e7792a029 (diff) | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
Merge branch 'linus' into x86/urgent
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 | }; |