---

yaml --- r: 74693 b: refs/heads/master c: e35de02 h: refs/heads/master i: 74691: f273786 v: v3
git-mirror · Dec 7, 2007 · c3e823b · c3e823b
1 parent 0f77ab1
commit c3e823b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e71a11c9f3c09a01fcb445772ffd61b140f2479
+refs/heads/master: e35de02615f97b785dc6f73cba421cea06bcbd10
diff --git a/trunk/net/8021q/vlan.c b/trunk/net/8021q/vlan.c
@@ -776,7 +776,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
 	case SET_VLAN_NAME_TYPE_CMD:
 		err = -EPERM;
 		if (!capable(CAP_NET_ADMIN))
-			return -EPERM;
+			break;
 		if ((args.u.name_type >= 0) &&
 		    (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
 			vlan_name_type = args.u.name_type;