summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJason Wang <jasowang@redhat.com>2013-07-16 09:36:33 +0400
committerDavid S. Miller <davem@davemloft.net>2013-07-17 00:01:57 +0400
commit82a19eb8c02ab98bfe0bf6fa4915de370acb2858 (patch)
tree5cb2c258e6f0ce9d0f3799d687985135e70df182 /drivers
parent21d1196a35f5686c4323e42a62fdb4b23b0ab4a3 (diff)
downloadlinux-82a19eb8c02ab98bfe0bf6fa4915de370acb2858.tar.xz
macvtap: fix the missing ret value of TUNSETQUEUE
Commit 441ac0fcaadc76ad09771812382345001dd2b813 (macvtap: Convert to using rtnl lock) forget to return what macvtap_ioctl_set_queue() returns to its caller. This may break multiqueue API by always falling through to TUNGETFEATURES. Cc: Vlad Yasevich <vyasevic@redhat.com> Signed-off-by: Jason Wang <jasowang@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/macvtap.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index 876c72246ae9..0e5492ec753a 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -1107,6 +1107,7 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
rtnl_lock();
ret = macvtap_ioctl_set_queue(file, u);
rtnl_unlock();
+ return ret;
case TUNGETFEATURES:
if (put_user(IFF_TAP | IFF_NO_PI | IFF_VNET_HDR |