diff options
author | Jiri Pirko <jpirko@redhat.com> | 2011-07-21 06:30:00 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-07-21 13:47:55 -0700 |
commit | a0f1d603ee4186081fda0ad48ccf6163c2009f10 (patch) | |
tree | 78210e5e208d6f909e93a5c70d8ce857a8d7c925 /drivers/net/igbvf/igbvf.h | |
parent | 87c288c6e9aa31720b72e2bc2d665e24e1653c3e (diff) | |
download | op-kernel-dev-a0f1d603ee4186081fda0ad48ccf6163c2009f10.zip op-kernel-dev-a0f1d603ee4186081fda0ad48ccf6163c2009f10.tar.gz |
igbvf: do vlan cleanup
- unify vlan and nonvlan rx path
- kill adapter->vlgrp and igbvf_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/igbvf/igbvf.h')
-rw-r--r-- | drivers/net/igbvf/igbvf.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/igbvf/igbvf.h b/drivers/net/igbvf/igbvf.h index d5dad5d..fd4a7b7 100644 --- a/drivers/net/igbvf/igbvf.h +++ b/drivers/net/igbvf/igbvf.h @@ -34,7 +34,7 @@ #include <linux/timer.h> #include <linux/io.h> #include <linux/netdevice.h> - +#include <linux/if_vlan.h> #include "vf.h" @@ -173,7 +173,7 @@ struct igbvf_adapter { const struct igbvf_info *ei; - struct vlan_group *vlgrp; + unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)]; u32 bd_number; u32 rx_buffer_len; u32 polling_interval; |