From 4b91a23e267b5836c9487801f45794c243cd372b Mon Sep 17 00:00:00 2001
From: "Michael S. Tsirkin" <mst@redhat.com>
Date: Thu, 10 Jan 2013 01:31:08 +0000
Subject: [PATCH] --- yaml --- r: 348621 b: refs/heads/master c:
 9d43a18c6e8f868111b983388feeedaea7594fef h: refs/heads/master i:   348619:
 6f9ab03e7392a21c60e4592d7a68f10afabfca0d v: v3

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

diff --git a/[refs] b/[refs]
index ad8261864479..21da3454dcb8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 337da3e3f5564c5d8ca0962a0338d8c561c9f9c7
+refs/heads/master: 9d43a18c6e8f868111b983388feeedaea7594fef
diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c
index cf6da6efc71a..99b58d862174 100644
--- a/trunk/drivers/net/tun.c
+++ b/trunk/drivers/net/tun.c
@@ -1791,8 +1791,6 @@ static int tun_set_queue(struct file *file, struct ifreq *ifr)
 		tun = tfile->detached;
 		if (!tun)
 			ret = -EINVAL;
-		else if (tun_not_capable(tun))
-			ret = -EPERM;
 		else
 			ret = tun_attach(tun, file);
 	} else if (ifr->ifr_flags & IFF_DETACH_QUEUE) {