diff options
| author |   Jesse Gross <jesse@nicira.com> | 2010-10-20 13:56:02 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-10-21 01:26:50 -0700 |
| commit | b738127dfb469bb9f595cdace30e7f881e8146b2 (patch) | |
| tree | a2d79958aa2da098dc38c72973205d516896c54b /drivers/net/benet | |
| parent | ebtables: Allow filtering of hardware accelerated vlan frames. (diff) | |
| download | linux-dev-b738127dfb469bb9f595cdace30e7f881e8146b2.tar.xz linux-dev-b738127dfb469bb9f595cdace30e7f881e8146b2.zip | |
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 'drivers/net/benet')
| -rw-r--r-- | drivers/net/benet/be.h | 2 | ||||
| -rw-r--r-- | drivers/net/benet/be_main.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/benet/be.h b/drivers/net/benet/be.h index 1afabb1e6620..59a17b569b7f 100644 --- a/drivers/net/benet/be.h +++ b/drivers/net/benet/be.h @@ -263,7 +263,7 @@ struct be_adapter { struct vlan_group *vlan_grp; u16 vlans_added; u16 max_vlans; /* Number of vlans supported */ - u8 vlan_tag[VLAN_GROUP_ARRAY_LEN]; + u8 vlan_tag[VLAN_N_VID]; struct be_dma_mem mc_cmd_mem; struct be_dma_mem stats_cmd; diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c index 9a1cd28b426d..4b59e53890b2 100644 --- a/drivers/net/benet/be_main.c +++ b/drivers/net/benet/be_main.c @@ -626,7 +626,7 @@ static int be_vid_config(struct be_adapter *adapter, bool vf, u32 vf_num) if (adapter->vlans_added <= adapter->max_vlans) { /* Construct VLAN Table to give to HW */ - for (i = 0; i < VLAN_GROUP_ARRAY_LEN; i++) { + for (i = 0; i < VLAN_N_VID; i++) { if (adapter->vlan_tag[i]) { vtag[ntags] = cpu_to_le16(i); ntags++; |