Merge branch 'for-upstream' of git://openrisc.net/jonas/linux

[pandora-kernel.git] / drivers / net / bna / bnad.h

diff --git a/drivers/net/bna/bnad.h b/drivers/net/bna/bnad.h
index ccdabad..7aa550b 100644 (file)
--- 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.