diff options
author | Jesse Gross <jesse@nicira.com> | 2010-10-20 09:56:02 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-10-21 04:26:50 -0400 |
commit | b738127dfb469bb9f595cdace30e7f881e8146b2 (patch) | |
tree | a2d79958aa2da098dc38c72973205d516896c54b /net/bridge | |
parent | 13937911f93ef52ae652f4652761aea6a58d3193 (diff) |
vlan: Rename VLAN_GROUP_ARRAY_LEN to VLAN_N_VID.
VLAN_GROUP_ARRAY_LEN is simply the number of possible vlan VIDs.
Since vlan groups will soon be more of an implementation detail
for vlan devices, rename the constant to be descriptive of its
actual purpose.
Signed-off-by: Jesse Gross <jesse@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
-rw-r--r-- | net/bridge/netfilter/ebt_vlan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/netfilter/ebt_vlan.c b/net/bridge/netfilter/ebt_vlan.c index cc11d6b8e507..eae67bf0446c 100644 --- a/net/bridge/netfilter/ebt_vlan.c +++ b/net/bridge/netfilter/ebt_vlan.c | |||
@@ -118,10 +118,10 @@ static int ebt_vlan_mt_check(const struct xt_mtchk_param *par) | |||
118 | * 0 - The null VLAN ID. | 118 | * 0 - The null VLAN ID. |
119 | * 1 - The default Port VID (PVID) | 119 | * 1 - The default Port VID (PVID) |
120 | * 0x0FFF - Reserved for implementation use. | 120 | * 0x0FFF - Reserved for implementation use. |
121 | * if_vlan.h: VLAN_GROUP_ARRAY_LEN 4096. */ | 121 | * if_vlan.h: VLAN_N_VID 4096. */ |
122 | if (GET_BITMASK(EBT_VLAN_ID)) { | 122 | if (GET_BITMASK(EBT_VLAN_ID)) { |
123 | if (!!info->id) { /* if id!=0 => check vid range */ | 123 | if (!!info->id) { /* if id!=0 => check vid range */ |
124 | if (info->id > VLAN_GROUP_ARRAY_LEN) { | 124 | if (info->id > VLAN_N_VID) { |
125 | pr_debug("id %d is out of range (1-4096)\n", | 125 | pr_debug("id %d is out of range (1-4096)\n", |
126 | info->id); | 126 | info->id); |
127 | return -EINVAL; | 127 | return -EINVAL; |