diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2015-09-09 21:24:56 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2015-09-16 11:48:07 +0200 |
| commit | 4e9fa50c6ccbebef0c4a4aae84090badf81359e6 (patch) | |
| tree | 3c0a7132a475b49fb58c155773c114b1e5e18b74 /drivers/vhost/net.c | |
| parent | tools/virtio: fix build after 4.2 changes (diff) | |
| download | linux-4e9fa50c6ccbebef0c4a4aae84090badf81359e6.tar.xz linux-4e9fa50c6ccbebef0c4a4aae84090badf81359e6.zip | |
vhost: move features to core
virtio 1 and any layout are core features, move them
there. This fixes vhost test.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'drivers/vhost/net.c')
| -rw-r--r-- | drivers/vhost/net.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index 7d137a43cc86..9eda69e40678 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -61,8 +61,7 @@ MODULE_PARM_DESC(experimental_zcopytx, "Enable Zero Copy TX;" enum { VHOST_NET_FEATURES = VHOST_FEATURES | (1ULL << VHOST_NET_F_VIRTIO_NET_HDR) | - (1ULL << VIRTIO_NET_F_MRG_RXBUF) | - (1ULL << VIRTIO_F_VERSION_1), + (1ULL << VIRTIO_NET_F_MRG_RXBUF) }; enum { |