aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/benet
diff options
context:
space:
mode:
authorJesse Gross <jesse@nicira.com>2010-10-20 09:56:02 -0400
committerDavid S. Miller <davem@davemloft.net>2010-10-21 04:26:50 -0400
commitb738127dfb469bb9f595cdace30e7f881e8146b2 (patch)
treea2d79958aa2da098dc38c72973205d516896c54b /drivers/net/benet
parent13937911f93ef52ae652f4652761aea6a58d3193 (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 'drivers/net/benet')
-rw-r--r--drivers/net/benet/be.h2
-rw-r--r--drivers/net/benet/be_main.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/benet/be.h b/drivers/net/benet/be.h
index 1afabb1e662..59a17b569b7 100644
--- a/drivers/net/benet/be.h
+++ b/drivers/net/benet/be.h
@@ -263,7 +263,7 @@ struct be_adapter {
263 struct vlan_group *vlan_grp; 263 struct vlan_group *vlan_grp;
264 u16 vlans_added; 264 u16 vlans_added;
265 u16 max_vlans; /* Number of vlans supported */ 265 u16 max_vlans; /* Number of vlans supported */
266 u8 vlan_tag[VLAN_GROUP_ARRAY_LEN]; 266 u8 vlan_tag[VLAN_N_VID];
267 struct be_dma_mem mc_cmd_mem; 267 struct be_dma_mem mc_cmd_mem;
268 268
269 struct be_dma_mem stats_cmd; 269 struct be_dma_mem stats_cmd;
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index 9a1cd28b426..4b59e53890b 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)
626 626
627 if (adapter->vlans_added <= adapter->max_vlans) { 627 if (adapter->vlans_added <= adapter->max_vlans) {
628 /* Construct VLAN Table to give to HW */ 628 /* Construct VLAN Table to give to HW */
629 for (i = 0; i < VLAN_GROUP_ARRAY_LEN; i++) { 629 for (i = 0; i < VLAN_N_VID; i++) {
630 if (adapter->vlan_tag[i]) { 630 if (adapter->vlan_tag[i]) {
631 vtag[ntags] = cpu_to_le16(i); 631 vtag[ntags] = cpu_to_le16(i);
632 ntags++; 632 ntags++;