diff options
Diffstat (limited to 'drivers/vhost/net.c')
-rw-r--r-- | drivers/vhost/net.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index ff6c91995c96..1802ab662082 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c | |||
@@ -942,8 +942,11 @@ static long vhost_net_ioctl(struct file *f, unsigned int ioctl, | |||
942 | return vhost_net_reset_owner(n); | 942 | return vhost_net_reset_owner(n); |
943 | default: | 943 | default: |
944 | mutex_lock(&n->dev.mutex); | 944 | mutex_lock(&n->dev.mutex); |
945 | r = vhost_dev_ioctl(&n->dev, ioctl, arg); | 945 | r = vhost_dev_ioctl(&n->dev, ioctl, argp); |
946 | vhost_net_flush(n); | 946 | if (r == -ENOIOCTLCMD) |
947 | r = vhost_vring_ioctl(&n->dev, ioctl, argp); | ||
948 | else | ||
949 | vhost_net_flush(n); | ||
947 | mutex_unlock(&n->dev.mutex); | 950 | mutex_unlock(&n->dev.mutex); |
948 | return r; | 951 | return r; |
949 | } | 952 | } |