From c3e823bd0d6af582e8ade54960dce30a78e56974 Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Thu, 6 Dec 2007 22:52:16 -0800
Subject: [PATCH] --- yaml --- r: 74693 b: refs/heads/master c:
 e35de02615f97b785dc6f73cba421cea06bcbd10 h: refs/heads/master i:   74691:
 f27378645673dbfdbd85a2b516219634f5ff5539 v: v3

---
 [refs]                 | 2 +-
 trunk/net/8021q/vlan.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0980e53db3db..93291eb9de06 100644
--- 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
index 6567213959cb..5b183156307a 100644
--- 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;