diff options
| author | Jiri Pirko <jpirko@redhat.com> | 2011-07-21 05:27:27 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-21 22:47:57 +0200 |
| commit | b2cb09b1a7725408a3464b2f593ceb222eff1042 (patch) | |
| tree | c27d1f76af4d6b91a3783ddff6246bb2eb0669dd /drivers/net/igb/igb.h | |
| parent | forcedeth: do vlan cleanup (diff) | |
| download | linux-b2cb09b1a7725408a3464b2f593ceb222eff1042.tar.xz linux-b2cb09b1a7725408a3464b2f593ceb222eff1042.zip | |
igb: do vlan cleanup
- unify vlan and nonvlan rx path
- kill adapter->vlgrp and igb_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/igb/igb.h')
| -rw-r--r-- | drivers/net/igb/igb.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/igb/igb.h b/drivers/net/igb/igb.h index 0389ff6ea696..265e151b66c4 100644 --- a/drivers/net/igb/igb.h +++ b/drivers/net/igb/igb.h @@ -37,6 +37,8 @@ #include <linux/clocksource.h> #include <linux/timecompare.h> #include <linux/net_tstamp.h> +#include <linux/bitops.h> +#include <linux/if_vlan.h> struct igb_adapter; @@ -252,7 +254,7 @@ static inline int igb_desc_unused(struct igb_ring *ring) struct igb_adapter { 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 wol; |