diff options
| author |   Jiri Pirko <jpirko@redhat.com> | 2011-07-20 04:54:14 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2011-07-21 13:47:54 -0700 |
| commit | f859d7cb7967efaedae194dd90a23a7a72fb216d (patch) | |
| tree | dd3e14f6d87a4320582c3fe9fcfa1532ddd4cd1a /drivers/net/bna/bnad.h | |
| parent | atl1e: do vlan cleanup (diff) | |
| download | linux-dev-f859d7cb7967efaedae194dd90a23a7a72fb216d.tar.xz linux-dev-f859d7cb7967efaedae194dd90a23a7a72fb216d.zip | |
bnad: do vlan cleanup
- unify vlan and nonvlan rx path
- kill bnad->vlan_grp and bnad_vlan_rx_register
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/bna/bnad.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/bna/bnad.h b/drivers/net/bna/bnad.h index ccdabad0a40c..7aa550b6182d 100644 --- a/drivers/net/bna/bnad.h +++ b/drivers/net/bna/bnad.h @@ -24,6 +24,7 @@ #include <linux/etherdevice.h> #include <linux/mutex.h> #include <linux/firmware.h> +#include <linux/if_vlan.h> /* Fix for IA64 */ #include <asm/checksum.h> @@ -216,7 +217,7 @@ struct bnad { struct bnad_tx_info tx_info[BNAD_MAX_TXS]; struct bnad_rx_info rx_info[BNAD_MAX_RXS]; - struct vlan_group *vlan_grp; + unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)]; /* * These q numbers are global only because * they are used to calculate MSIx vectors. |