diff options
| author | Jiri Pirko <jpirko@redhat.com> | 2011-07-20 04:54:40 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-21 13:47:57 -0700 |
| commit | 53515734888e018af7bcec6b4464bd9e28f1d655 (patch) | |
| tree | 17c7b3f3b8679cda9c47b9d680602ba972eeb2fa /drivers/net/vxge/vxge-main.h | |
| parent | b2cb09b1a7725408a3464b2f593ceb222eff1042 (diff) | |
vxge: do vlan cleanup
- unify vlan and nonvlan rx path
- kill vdev->vlgrp and vxge_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/vxge/vxge-main.h')
| -rw-r--r-- | drivers/net/vxge/vxge-main.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/vxge/vxge-main.h b/drivers/net/vxge/vxge-main.h index 66e6de86ff0..f52a42d1dbb 100644 --- a/drivers/net/vxge/vxge-main.h +++ b/drivers/net/vxge/vxge-main.h @@ -18,6 +18,8 @@ #include "vxge-config.h" #include "vxge-version.h" #include <linux/list.h> +#include <linux/bitops.h> +#include <linux/if_vlan.h> #define VXGE_DRIVER_NAME "vxge" #define VXGE_DRIVER_VENDOR "Neterion, Inc" @@ -287,7 +289,6 @@ struct vxge_ring { #define VXGE_MAX_MAC_ADDR_COUNT 30 int vlan_tag_strip; - struct vlan_group *vlgrp; u32 rx_vector_no; enum vxge_hw_status last_status; @@ -332,7 +333,7 @@ struct vxgedev { struct net_device *ndev; struct pci_dev *pdev; struct __vxge_hw_device *devh; - struct vlan_group *vlgrp; + unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)]; int vlan_tag_strip; struct vxge_config config; unsigned long state; |