network drivers: eliminate unneeded kill_vid code

Many drivers had code that did kill_vid, but they weren't doing vlan
filtering. With new API the stub is unneeded unless device sets
NETIF_F_HW_VLAN_FILTER.

Bad habit: I couldn't resist fixing a couple of nearby style things
in acenic, and forcedeth.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 3 insertions, 18 deletions

diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c
index 7122b7ba8d61..04382f979c99 100644
--- a/drivers/net/acenic.c
+++ b/drivers/net/acenic.c
@@ -480,12 +480,10 @@ static int __devinit acenic_probe_one(struct pci_dev *pdev,
 #if ACENIC_DO_VLAN
         dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
         dev->vlan_rx_register = ace_vlan_rx_register;
-        dev->vlan_rx_kill_vid = ace_vlan_rx_kill_vid;
 #endif
-        if (1) {
-                dev->tx_timeout = &ace_watchdog;
-                dev->watchdog_timeo = 5*HZ;
-        }
+
+        dev->tx_timeout = &ace_watchdog;
+        dev->watchdog_timeo = 5*HZ;
 
         dev->open = &ace_open;
         dev->stop = &ace_close;
@@ -2283,19 +2281,6 @@ static void ace_vlan_rx_register(struct net_device *dev, struct vlan_group *grp)
         ace_unmask_irq(dev);
         local_irq_restore(flags);
 }
-
-
-static void ace_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
-{
-        struct ace_private *ap = netdev_priv(dev);
-        unsigned long flags;
-
-        local_irq_save(flags);
-        ace_mask_irq(dev);
-        vlan_group_set_device(ap->vlgrp, vid, NULL);
-        ace_unmask_irq(dev);
-        local_irq_restore(flags);
-}
 #endif /* ACENIC_DO_VLAN */