diff options
author | Jesse Gross <jesse@nicira.com> | 2010-10-20 13:56:10 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-10-21 01:26:55 -0700 |
commit | f62bbb5e62c6e4a91fb222d22bc46e8d4d7e59ef (patch) | |
tree | d85a5bfb7daf205859da588d50cf2d04b6c011fc /drivers/net/ixgbe/ixgbe.h | |
parent | 7d0fd2117e3d0550d7987b3aff2bfbc0244cf7c6 (diff) | |
download | op-kernel-dev-f62bbb5e62c6e4a91fb222d22bc46e8d4d7e59ef.zip op-kernel-dev-f62bbb5e62c6e4a91fb222d22bc46e8d4d7e59ef.tar.gz |
ixgbe: Update ixgbe to use new vlan accleration.
Make the ixgbe driver use the new vlan accleration model.
Signed-off-by: Jesse Gross <jesse@nicira.com>
CC: Peter Waskiewicz <peter.p.waskiewicz.jr@intel.com>
CC: Emil Tantilov <emil.s.tantilov@intel.com>
CC: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ixgbe/ixgbe.h')
-rw-r--r-- | drivers/net/ixgbe/ixgbe.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ixgbe/ixgbe.h b/drivers/net/ixgbe/ixgbe.h index a8c47b0..5e38de7 100644 --- a/drivers/net/ixgbe/ixgbe.h +++ b/drivers/net/ixgbe/ixgbe.h @@ -28,11 +28,13 @@ #ifndef _IXGBE_H_ #define _IXGBE_H_ +#include <linux/bitops.h> #include <linux/types.h> #include <linux/pci.h> #include <linux/netdevice.h> #include <linux/cpumask.h> #include <linux/aer.h> +#include <linux/if_vlan.h> #include "ixgbe_type.h" #include "ixgbe_common.h" @@ -287,7 +289,7 @@ struct ixgbe_q_vector { /* board specific private data structure */ struct ixgbe_adapter { struct timer_list watchdog_timer; - struct vlan_group *vlgrp; + unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)]; u16 bd_number; struct work_struct reset_task; struct ixgbe_q_vector *q_vector[MAX_MSIX_Q_VECTORS]; |