summaryrefslogtreecommitdiffstats
path: root/drivers/net/acenic.h
diff options
context:
space:
mode:
authorJiri Pirko <jpirko@redhat.com>2011-07-20 04:54:29 +0000
committerDavid S. Miller <davem@davemloft.net>2011-07-21 13:47:56 -0700
commit08dddfc3f6e39fc81238ef4804815c559f314066 (patch)
treee4726f916debe3e64db3529a0d1aa4395ece5daa /drivers/net/acenic.h
parentdadcd65f52921456112183fde543fc214bb0a227 (diff)
downloadlinux-stable-08dddfc3f6e39fc81238ef4804815c559f314066.tar.gz
linux-stable-08dddfc3f6e39fc81238ef4804815c559f314066.tar.bz2
linux-stable-08dddfc3f6e39fc81238ef4804815c559f314066.zip
acenic: do vlan cleanup
- unify vlan and nonvlan rx path - kill ap->vlgrp and ace_vlan_rx_register - enable vlan hw accel always (kill vlan ifdefs) Signed-off-by: Jiri Pirko <jpirko@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/acenic.h')
-rw-r--r--drivers/net/acenic.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/acenic.h b/drivers/net/acenic.h
index fd25a3b47fef..f67dc9b0eb80 100644
--- a/drivers/net/acenic.h
+++ b/drivers/net/acenic.h
@@ -665,10 +665,6 @@ struct ace_private
struct rx_desc *rx_mini_ring;
struct rx_desc *rx_return_ring;
-#if ACENIC_DO_VLAN
- struct vlan_group *vlgrp;
-#endif
-
int tasklet_pending, jumbo;
struct tasklet_struct ace_tasklet;
@@ -790,8 +786,5 @@ static void ace_free_descriptors(struct net_device *dev);
static void ace_init_cleanup(struct net_device *dev);
static struct net_device_stats *ace_get_stats(struct net_device *dev);
static int read_eeprom_byte(struct net_device *dev, unsigned long offset);
-#if ACENIC_DO_VLAN
-static void ace_vlan_rx_register(struct net_device *dev, struct vlan_group *grp);
-#endif
#endif /* _ACENIC_H_ */