diff options
| author |   Jesse Gross <jesse@nicira.com> | 2011-06-23 13:04:39 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2011-06-27 20:56:51 -0700 |
| commit | 72e85c45b9541e1f3d233e775da1dc6f68b85867 (patch) | |
| tree | f5cb5ae4166282031c77fc8dc3a324a43304679e /drivers/net/vmxnet3/vmxnet3_int.h | |
| parent | can: bfin_can: auto-calculate accessor sizes (diff) | |
| download | linux-dev-72e85c45b9541e1f3d233e775da1dc6f68b85867.tar.xz linux-dev-72e85c45b9541e1f3d233e775da1dc6f68b85867.zip | |
vmxnet3: Convert to new vlan model.
This converts the vmxnet3 driver to use the new vlan model. In doing so
it fixes missing tags in tcpdump and failure to do checksum offload when
tx vlan offload is disabled.
CC: Shreyas Bhatewara <sbhatewara@vmware.com>
CC: VMware PV-Drivers <pv-drivers@vmware.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>
Signed-off-by: Scott J. Goldman <scottjg@vmware.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/vmxnet3/vmxnet3_int.h')
| -rw-r--r-- | drivers/net/vmxnet3/vmxnet3_int.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h index 0e567c249d6d..2e37985809d2 100644 --- a/drivers/net/vmxnet3/vmxnet3_int.h +++ b/drivers/net/vmxnet3/vmxnet3_int.h @@ -27,6 +27,7 @@ #ifndef _VMXNET3_INT_H #define _VMXNET3_INT_H +#include <linux/bitops.h> #include <linux/ethtool.h> #include <linux/delay.h> #include <linux/netdevice.h> @@ -315,7 +316,7 @@ struct vmxnet3_intr { struct vmxnet3_adapter { struct vmxnet3_tx_queue tx_queue[VMXNET3_DEVICE_MAX_TX_QUEUES]; struct vmxnet3_rx_queue rx_queue[VMXNET3_DEVICE_MAX_RX_QUEUES]; - struct vlan_group *vlan_grp; + unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)]; struct vmxnet3_intr intr; spinlock_t cmd_lock; struct Vmxnet3_DriverShared *shared; |