---

yaml --- r: 369882 b: refs/heads/master c: e8dbad6 h: refs/heads/master v: v3
git-mirror · Apr 25, 2013 · 11b7545 · 11b7545
1 parent 7dba781
commit 11b7545
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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;