diff options
| author | David S. Miller <davem@davemloft.net> | 2012-07-22 12:19:24 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-22 12:19:24 -0700 |
| commit | 5dc7c77967a64a1c2cb1a45f45f580fa18927a4c (patch) | |
| tree | 286a35eef8b89d95968166445e568fc7c125582e /drivers/vhost/test.c | |
| parent | 2a304bb8fa6a60cf6039f9a686798ec330f198ef (diff) | |
| parent | 163049aefdc04323a2d17ec9f2862027b43b0502 (diff) | |
Merge branch 'vhost-net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Diffstat (limited to 'drivers/vhost/test.c')
| -rw-r--r-- | drivers/vhost/test.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/vhost/test.c b/drivers/vhost/test.c index 3de00d9fae2..91d6f060aad 100644 --- a/drivers/vhost/test.c +++ b/drivers/vhost/test.c @@ -261,14 +261,14 @@ static long vhost_test_ioctl(struct file *f, unsigned int ioctl, return -EFAULT; return vhost_test_run(n, test); case VHOST_GET_FEATURES: - features = VHOST_FEATURES; + features = VHOST_NET_FEATURES; if (copy_to_user(featurep, &features, sizeof features)) return -EFAULT; return 0; case VHOST_SET_FEATURES: if (copy_from_user(&features, featurep, sizeof features)) return -EFAULT; - if (features & ~VHOST_FEATURES) + if (features & ~VHOST_NET_FEATURES) return -EOPNOTSUPP; return vhost_test_set_features(n, features); case VHOST_RESET_OWNER: |