diff options
| author | Jiri Pirko <jpirko@redhat.com> | 2011-07-21 03:25:09 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-21 13:47:56 -0700 |
| commit | dadcd65f52921456112183fde543fc214bb0a227 (patch) | |
| tree | 0909d94a29e176558ee80af3d0dfc6359ab16de7 /drivers/net/ixgbevf/ixgbevf.h | |
| parent | 6dacaddd4850cbd6390d4f87548262b5ed79b4a5 (diff) | |
| download | blackbird-op-linux-dadcd65f52921456112183fde543fc214bb0a227.tar.gz blackbird-op-linux-dadcd65f52921456112183fde543fc214bb0a227.zip | |
ixgbevf: do vlan cleanup
- unify vlan and nonvlan rx path
- kill adapter->vlgrp and ixgbevf_vlan_rx_register
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ixgbevf/ixgbevf.h')
| -rw-r--r-- | drivers/net/ixgbevf/ixgbevf.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ixgbevf/ixgbevf.h b/drivers/net/ixgbevf/ixgbevf.h index a2bbbb358161..8857df4dd3b9 100644 --- a/drivers/net/ixgbevf/ixgbevf.h +++ b/drivers/net/ixgbevf/ixgbevf.h @@ -29,9 +29,11 @@ #define _IXGBEVF_H_ #include <linux/types.h> +#include <linux/bitops.h> #include <linux/timer.h> #include <linux/io.h> #include <linux/netdevice.h> +#include <linux/if_vlan.h> #include "vf.h" @@ -185,9 +187,7 @@ struct ixgbevf_q_vector { /* board specific private data structure */ struct ixgbevf_adapter { struct timer_list watchdog_timer; -#ifdef NETIF_F_HW_VLAN_TX - struct vlan_group *vlgrp; -#endif + unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)]; u16 bd_number; struct work_struct reset_task; struct ixgbevf_q_vector *q_vector[MAX_MSIX_Q_VECTORS]; |
