diff options
| author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-03-25 16:01:01 +0000 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-04-13 19:17:50 -0700 |
| commit | 86d70e532c352bd309dab5f1d18d113f441cb3ae (patch) | |
| tree | f905aa3db40ff99c23e1d7574a919c0c458183e4 /drivers/net/e1000e/e1000.h | |
| parent | a5cc764206a3d01dce8ebc17b4e1534afb53c495 (diff) | |
| download | op-kernel-dev-86d70e532c352bd309dab5f1d18d113f441cb3ae.zip op-kernel-dev-86d70e532c352bd309dab5f1d18d113f441cb3ae.tar.gz | |
e1000e: convert to new VLAN model
This switches the e1000e driver to use the new VLAN interfaces.
CC: Jesse Gross <jesse@nicira.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Diffstat (limited to 'drivers/net/e1000e/e1000.h')
| -rw-r--r-- | drivers/net/e1000e/e1000.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h index 00bf595..500896e 100644 --- a/drivers/net/e1000e/e1000.h +++ b/drivers/net/e1000e/e1000.h @@ -31,6 +31,7 @@ #ifndef _E1000_H_ #define _E1000_H_ +#include <linux/bitops.h> #include <linux/types.h> #include <linux/timer.h> #include <linux/workqueue.h> @@ -39,6 +40,7 @@ #include <linux/pci.h> #include <linux/pci-aspm.h> #include <linux/crc32.h> +#include <linux/if_vlan.h> #include "hw.h" @@ -280,7 +282,7 @@ struct e1000_adapter { const struct e1000_info *ei; - struct vlan_group *vlgrp; + unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)]; u32 bd_number; u32 rx_buffer_len; u16 mng_vlan_id; |
