diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-07 18:59:48 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-07 18:59:48 (GMT) |
| commit | 29ac0052ea454871273a1fc7ef09a97f3c214ee6 (patch) | |
| tree | 40441a8ec1f34b508ae1cc4bb91f9fabad4889e9 /net/8021q/vlan.c | |
| parent | f3656b9a2740ebdff123b30b6b806648c9f189f8 (diff) | |
| parent | 4aa9cb320e8081fbaec0c10eb0e077c8ca4d1ad9 (diff) | |
| download | linux-fsl-qoriq-29ac0052ea454871273a1fc7ef09a97f3c214ee6.tar.xz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[AF_RXRPC]: Add a missing goto
[VLAN]: Lost rtnl_unlock() in vlan_ioctl()
[SCTP]: Fix the bind_addr info during migration.
[SCTP]: Add bind hash locking to the migrate code
[IPV4]: Remove prototype of ip_rt_advice
[IPv4]: Reply net unreachable ICMP message
[IPv6] SNMP: Increment OutNoRoutes when connecting to unreachable network
[BRIDGE]: Section fix.
[NIU]: Fix link LED handling.
Diffstat (limited to 'net/8021q/vlan.c')
| -rw-r--r-- | net/8021q/vlan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index 6567213..5b18315 100644 --- a/net/8021q/vlan.c +++ b/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; |