Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit b738127d authored Oct 20, 2010 by Jesse Gross Committed by David S. Miller Oct 21, 2010

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>

parent 13937911

drivers/net/benet/be.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -263,7 +263,7 @@ struct be_adapter {
	struct vlan_group *vlan_grp;		struct vlan_group *vlan_grp;
	u16 vlans_added;		u16 vlans_added;
	u16 max_vlans; /* Number of vlans supported */		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 mc_cmd_mem;

	struct be_dma_mem stats_cmd;		struct be_dma_mem stats_cmd;

drivers/net/benet/be_main.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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) {		if (adapter->vlans_added <= adapter->max_vlans) {
	/* Construct VLAN Table to give to HW */		/* 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]) {		if (adapter->vlan_tag[i]) {
	vtag[ntags] = cpu_to_le16(i);		vtag[ntags] = cpu_to_le16(i);
	ntags++;		ntags++;

drivers/net/e1000/e1000_main.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4541,7 +4541,7 @@ static void e1000_restore_vlan(struct e1000_adapter *adapter)

	if (adapter->vlgrp) {		if (adapter->vlgrp) {
	u16 vid;		u16 vid;
	for (vid = 0; vid < VLAN_GROUP_ARRAY_LEN; vid++) {		for (vid = 0; vid < VLAN_N_VID; vid++) {
	if (!vlan_group_get_device(adapter->vlgrp, vid))		if (!vlan_group_get_device(adapter->vlgrp, vid))
	continue;		continue;
	e1000_vlan_rx_add_vid(adapter->netdev, vid);		e1000_vlan_rx_add_vid(adapter->netdev, vid);

drivers/net/e1000e/netdev.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2545,7 +2545,7 @@ static void e1000_restore_vlan(struct e1000_adapter *adapter)
	if (!adapter->vlgrp)		if (!adapter->vlgrp)
	return;		return;

	for (vid = 0; vid < VLAN_GROUP_ARRAY_LEN; vid++) {		for (vid = 0; vid < VLAN_N_VID; vid++) {
	if (!vlan_group_get_device(adapter->vlgrp, vid))		if (!vlan_group_get_device(adapter->vlgrp, vid))
	continue;		continue;
	e1000_vlan_rx_add_vid(adapter->netdev, vid);		e1000_vlan_rx_add_vid(adapter->netdev, vid);

drivers/net/igb/igb_main.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -6153,7 +6153,7 @@ static void igb_restore_vlan(struct igb_adapter *adapter)

	if (adapter->vlgrp) {		if (adapter->vlgrp) {
	u16 vid;		u16 vid;
	for (vid = 0; vid < VLAN_GROUP_ARRAY_LEN; vid++) {		for (vid = 0; vid < VLAN_N_VID; vid++) {
	if (!vlan_group_get_device(adapter->vlgrp, vid))		if (!vlan_group_get_device(adapter->vlgrp, vid))
	continue;		continue;
	igb_vlan_rx_add_vid(adapter->netdev, vid);		igb_vlan_rx_add_vid(adapter->netdev, vid);