diff options
| author | Emil Tantilov <emil.s.tantilov@intel.com> | 2011-01-27 09:14:18 +0000 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-03-11 01:16:23 -0800 |
| commit | e2444d92083cc1ceb07487425897d6d51a13e9dd (patch) | |
| tree | 0ef862edfb70906a0bedafd599943645303c3692 /drivers/net/ixgb/ixgb.h | |
| parent | 1b7fe59322bef9e7a2c05b64a07a66b875299736 (diff) | |
ixgb: convert to new VLAN model
Based on a patch from Jesse Gross <jesse@nicira.com>
This switches the ixgb driver to use the new VLAN interfaces.
In doing this, it completes the work begun in
ae54496f9e8d40c89e5668205c181dccfa9ecda1 allowing the use of
hardware VLAN insertion without having a VLAN group configured.
CC: Jesse Gross <jesse@nicira.com>
Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ixgb/ixgb.h')
| -rw-r--r-- | drivers/net/ixgb/ixgb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ixgb/ixgb.h b/drivers/net/ixgb/ixgb.h index 521c0c73299..8f3df044e81 100644 --- a/drivers/net/ixgb/ixgb.h +++ b/drivers/net/ixgb/ixgb.h @@ -149,7 +149,7 @@ struct ixgb_desc_ring { struct ixgb_adapter { struct timer_list watchdog_timer; - struct vlan_group *vlgrp; + unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)]; u32 bd_number; u32 rx_buffer_len; u32 part_num; |