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 /drivers/s390 | |
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 'drivers/s390')
-rw-r--r-- | drivers/s390/net/qeth_l3_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c index c094707fcbff..74d1401a5d5e 100644 --- a/drivers/s390/net/qeth_l3_main.c +++ b/drivers/s390/net/qeth_l3_main.c | |||
@@ -1820,7 +1820,7 @@ static void qeth_l3_add_vlan_mc(struct qeth_card *card) | |||
1820 | return; | 1820 | return; |
1821 | 1821 | ||
1822 | vg = card->vlangrp; | 1822 | vg = card->vlangrp; |
1823 | for (i = 0; i < VLAN_GROUP_ARRAY_LEN; i++) { | 1823 | for (i = 0; i < VLAN_N_VID; i++) { |
1824 | struct net_device *netdev = vlan_group_get_device(vg, i); | 1824 | struct net_device *netdev = vlan_group_get_device(vg, i); |
1825 | if (netdev == NULL || | 1825 | if (netdev == NULL || |
1826 | !(netdev->flags & IFF_UP)) | 1826 | !(netdev->flags & IFF_UP)) |
@@ -1883,7 +1883,7 @@ static void qeth_l3_add_vlan_mc6(struct qeth_card *card) | |||
1883 | return; | 1883 | return; |
1884 | 1884 | ||
1885 | vg = card->vlangrp; | 1885 | vg = card->vlangrp; |
1886 | for (i = 0; i < VLAN_GROUP_ARRAY_LEN; i++) { | 1886 | for (i = 0; i < VLAN_N_VID; i++) { |
1887 | struct net_device *netdev = vlan_group_get_device(vg, i); | 1887 | struct net_device *netdev = vlan_group_get_device(vg, i); |
1888 | if (netdev == NULL || | 1888 | if (netdev == NULL || |
1889 | !(netdev->flags & IFF_UP)) | 1889 | !(netdev->flags & IFF_UP)) |
@@ -2247,7 +2247,7 @@ static int qeth_l3_verify_vlan_dev(struct net_device *dev, | |||
2247 | if (!vg) | 2247 | if (!vg) |
2248 | return rc; | 2248 | return rc; |
2249 | 2249 | ||
2250 | for (i = 0; i < VLAN_GROUP_ARRAY_LEN; i++) { | 2250 | for (i = 0; i < VLAN_N_VID; i++) { |
2251 | if (vlan_group_get_device(vg, i) == dev) { | 2251 | if (vlan_group_get_device(vg, i) == dev) { |
2252 | rc = QETH_VLAN_CARD; | 2252 | rc = QETH_VLAN_CARD; |
2253 | break; | 2253 | break; |