From 08f3d5cc1ce6e853cf5b03a34af7a7314a9cdaba Mon Sep 17 00:00:00 2001
From: Jason Wang <jasowang@redhat.com>
Date: Tue, 28 May 2013 18:32:11 +0000
Subject: [PATCH] --- yaml --- r: 376631 b: refs/heads/master c:
 8e6d91ae0917bf934ed86411148f79d904728d51 h: refs/heads/master i:   376629:
 067f90695f2f81272619db0aa46f5d24534a348e   376627:
 a851d88d3612fbb455d0a079df5c2e2f79ec05aa   376623:
 c51075055562ff6f892926febc8b2f8a5ccc5ee1 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/tun.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b54740f9a1f9..eff50a2412df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 456db6a4d495f40777da6f1f32f62f13026f52db
+refs/heads/master: 8e6d91ae0917bf934ed86411148f79d904728d51
diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c
index f042b0373e5d..89776c592151 100644
--- a/trunk/drivers/net/tun.c
+++ b/trunk/drivers/net/tun.c
@@ -1585,6 +1585,10 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
 		else
 			return -EINVAL;
 
+		if (!!(ifr->ifr_flags & IFF_MULTI_QUEUE) !=
+		    !!(tun->flags & TUN_TAP_MQ))
+			return -EINVAL;
+
 		if (tun_not_capable(tun))
 			return -EPERM;
 		err = security_tun_dev_open(tun->security);