diff options
| author | Jiri Pirko <jpirko@redhat.com> | 2011-07-21 07:26:31 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-22 00:47:57 +0400 |
| commit | 5622e4044a916de1af84bfcc4d437ce0c799d531 (patch) | |
| tree | 1ed8e79892147ffe8c746cc4b5f6ee6eeb06426b /drivers/net/e1000/e1000.h | |
| parent | a4aeb26628b5184386f99cf202ac837b0e56c975 (diff) | |
| download | linux-5622e4044a916de1af84bfcc4d437ce0c799d531.tar.xz | |
e1000: do vlan cleanup
- unify vlan and nonvlan rx path
- kill adapter->vlgrp and e1000_vlan_rx_register
- allow to turn on/off rx/tx vlan accel via ethtool (set_features)
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e1000/e1000.h')
| -rw-r--r-- | drivers/net/e1000/e1000.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h index 8676899120c3..24f41da8c4be 100644 --- a/drivers/net/e1000/e1000.h +++ b/drivers/net/e1000/e1000.h @@ -215,7 +215,7 @@ struct e1000_adapter { struct timer_list tx_fifo_stall_timer; struct timer_list watchdog_timer; struct timer_list phy_info_timer; - struct vlan_group *vlgrp; + unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)]; u16 mng_vlan_id; u32 bd_number; u32 rx_buffer_len; |