diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-12-09 23:41:22 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-09 23:41:22 -0500 |
| commit | b242a60206881559bb3102110048762422e6b74e (patch) | |
| tree | 86459efa47b9c3f69d865b4495beede9c4184003 /net/8021q/vlan.c | |
| parent | e1fd18656c2963e383d67b7006c0e06c9c1d9c79 (diff) | |
| parent | 94545baded0bfbabdc30a3a4cb48b3db479dd6ef (diff) | |
Merge branch 'linux-2.6'
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 6567213959cb..5b183156307a 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) | |||
| 776 | case SET_VLAN_NAME_TYPE_CMD: | 776 | case SET_VLAN_NAME_TYPE_CMD: |
| 777 | err = -EPERM; | 777 | err = -EPERM; |
| 778 | if (!capable(CAP_NET_ADMIN)) | 778 | if (!capable(CAP_NET_ADMIN)) |
| 779 | return -EPERM; | 779 | break; |
| 780 | if ((args.u.name_type >= 0) && | 780 | if ((args.u.name_type >= 0) && |
| 781 | (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) { | 781 | (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) { |
| 782 | vlan_name_type = args.u.name_type; | 782 | vlan_name_type = args.u.name_type; |