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, 0 insertions, 12 deletions

diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
index 3439f8c649f..717d8e9b983 100644
--- a/drivers/net/ns83820.c
+++ b/drivers/net/ns83820.c
@@ -506,17 +506,6 @@ static void ns83820_vlan_rx_register(struct net_device *ndev, struct vlan_group
         spin_unlock(&dev->tx_lock);
         spin_unlock_irq(&dev->misc_lock);
 }
-
-static void ns83820_vlan_rx_kill_vid(struct net_device *ndev, unsigned short vid)
-{
-        struct ns83820 *dev = PRIV(ndev);
-
-        spin_lock_irq(&dev->misc_lock);
-        spin_lock(&dev->tx_lock);
-        vlan_group_set_device(dev->vlgrp, vid, NULL);
-        spin_unlock(&dev->tx_lock);
-        spin_unlock_irq(&dev->misc_lock);
-}
 #endif
 
 /* Packet Receiver
@@ -2083,7 +2072,6 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev, const struct pci_
         /* We also support hardware vlan acceleration */
         ndev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
         ndev->vlan_rx_register = ns83820_vlan_rx_register;
-        ndev->vlan_rx_kill_vid = ns83820_vlan_rx_kill_vid;
 #endif
 
         if (using_dac) {