From: Jason Wang <jasowang@redhat.com>
Date: Tue, 16 Jul 2013 05:36:33 +0000 (+0800)
Subject: macvtap: fix the missing ret value of TUNSETQUEUE
X-Git-Tag: v3.11-rc2~14^2~11
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=82a19eb8c02ab98bfe0bf6fa4915de370acb2858;hp=21d1196a35f5686c4323e42a62fdb4b23b0ab4a3;p=~andy%2Flinux

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>
---

diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index 876c72246ae..0e5492ec753 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 |