---

yaml --- r: 166240 b: refs/heads/master c: 36989b9 h: refs/heads/master v: v3
git-mirror · Sep 22, 2009 · d944f6a · d944f6a
1 parent 0fb9830
commit d944f6a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9cc4085585a011179caf86a6408225626f6c2263
+refs/heads/master: 36989b90879c785f95b877bdcf65a2527dadd893
diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c
@@ -946,8 +946,6 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
 		char *name;
 		unsigned long flags = 0;
 
-		err = -EINVAL;
-
 		if (!capable(CAP_NET_ADMIN))
 			return -EPERM;
 		err = security_tun_dev_create();
@@ -964,7 +962,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
 			flags |= TUN_TAP_DEV;
 			name = "tap%d";
 		} else
-			goto failed;
+			return -EINVAL;
 
 		if (*ifr->ifr_name)
 			name = ifr->ifr_name;