diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-09-03 02:26:33 -0400 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-09-03 02:26:33 -0400 |
| commit | c50e86ce7c2961a41f2f7aa6e4fd6c99229ba205 (patch) | |
| tree | 4ea36009719bd8fc523239fe1bdccb90f0dce3ae /drivers/vhost/net.c | |
| parent | 14d33d384693eb6083396199de516fdef320f7af (diff) | |
| parent | 4cbe5a555fa58a79b6ecbb6c531b8bab0650778d (diff) | |
Merge tag 'v3.6-rc4'
Merge 3.6-rc4 to get latest OMAP and device tree fixes.
Diffstat (limited to 'drivers/vhost/net.c')
| -rw-r--r-- | drivers/vhost/net.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index f82a7394756e..072cbbadbc36 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c | |||
| @@ -823,14 +823,14 @@ static long vhost_net_ioctl(struct file *f, unsigned int ioctl, | |||
| 823 | return -EFAULT; | 823 | return -EFAULT; |
| 824 | return vhost_net_set_backend(n, backend.index, backend.fd); | 824 | return vhost_net_set_backend(n, backend.index, backend.fd); |
| 825 | case VHOST_GET_FEATURES: | 825 | case VHOST_GET_FEATURES: |
| 826 | features = VHOST_FEATURES; | 826 | features = VHOST_NET_FEATURES; |
| 827 | if (copy_to_user(featurep, &features, sizeof features)) | 827 | if (copy_to_user(featurep, &features, sizeof features)) |
| 828 | return -EFAULT; | 828 | return -EFAULT; |
| 829 | return 0; | 829 | return 0; |
| 830 | case VHOST_SET_FEATURES: | 830 | case VHOST_SET_FEATURES: |
| 831 | if (copy_from_user(&features, featurep, sizeof features)) | 831 | if (copy_from_user(&features, featurep, sizeof features)) |
| 832 | return -EFAULT; | 832 | return -EFAULT; |
| 833 | if (features & ~VHOST_FEATURES) | 833 | if (features & ~VHOST_NET_FEATURES) |
| 834 | return -EOPNOTSUPP; | 834 | return -EOPNOTSUPP; |
| 835 | return vhost_net_set_features(n, features); | 835 | return vhost_net_set_features(n, features); |
| 836 | case VHOST_RESET_OWNER: | 836 | case VHOST_RESET_OWNER: |