diff options
| author | Stephen Hemminger <shemminger@linux-foundation.org> | 2007-06-01 09:44:01 -0700 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-06-03 11:44:20 -0400 |
| commit | 25805dcf9d83098cf5492117ad2669cd14cc9b24 (patch) | |
| tree | 741134040babb0c2bce52d054fa5f08cf530449d /drivers/net/chelsio/cxgb2.c | |
| parent | cb434e380d58d3956c75dc5ead00eced599b9d16 (diff) | |
| download | linux-25805dcf9d83098cf5492117ad2669cd14cc9b24.tar.gz linux-25805dcf9d83098cf5492117ad2669cd14cc9b24.tar.bz2 linux-25805dcf9d83098cf5492117ad2669cd14cc9b24.zip | |
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>
Diffstat (limited to 'drivers/net/chelsio/cxgb2.c')
| -rw-r--r-- | drivers/net/chelsio/cxgb2.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/net/chelsio/cxgb2.c b/drivers/net/chelsio/cxgb2.c index 125c9b105869..231ce43b97cf 100644 --- a/drivers/net/chelsio/cxgb2.c +++ b/drivers/net/chelsio/cxgb2.c @@ -883,15 +883,6 @@ static void vlan_rx_register(struct net_device *dev, t1_set_vlan_accel(adapter, grp != NULL); spin_unlock_irq(&adapter->async_lock); } - -static void vlan_rx_kill_vid(struct net_device *dev, unsigned short vid) -{ - struct adapter *adapter = dev->priv; - - spin_lock_irq(&adapter->async_lock); - vlan_group_set_device(adapter->vlan_grp, vid, NULL); - spin_unlock_irq(&adapter->async_lock); -} #endif #ifdef CONFIG_NET_POLL_CONTROLLER @@ -1099,7 +1090,6 @@ static int __devinit init_one(struct pci_dev *pdev, netdev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX; netdev->vlan_rx_register = vlan_rx_register; - netdev->vlan_rx_kill_vid = vlan_rx_kill_vid; #endif /* T204: disable TSO */ |