From 11b7545d8efcb8cd70f19321a002529cf7bb8af6 Mon Sep 17 00:00:00 2001
From: Jason Wang <jasowang@redhat.com>
Date: Mon, 22 Apr 2013 20:40:39 +0000
Subject: [PATCH] --- yaml --- r: 369882 b: refs/heads/master c:
 e8dbad66ef56074eadb41ed5998acd2320447018 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/tun.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 13bed2a910dc..c070a5ac7efe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ffedc6ed3d066f5c0d2c2106f9081170b3d24fa
+refs/heads/master: e8dbad66ef56074eadb41ed5998acd2320447018
diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c
index 729ed533bb33..0c9df2fe8f05 100644
--- a/trunk/drivers/net/tun.c
+++ b/trunk/drivers/net/tun.c
@@ -1593,8 +1593,12 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
 			return err;
 
 		if (tun->flags & TUN_TAP_MQ &&
-		    (tun->numqueues + tun->numdisabled > 1))
-			return -EBUSY;
+		    (tun->numqueues + tun->numdisabled > 1)) {
+			/* One or more queue has already been attached, no need
+			 * to initialize the device again.
+			 */
+			return 0;
+		}
 	}
 	else {
 		char *name;