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/r8169.c | |
parent | cb434e380d58d3956c75dc5ead00eced599b9d16 (diff) | |
download | op-kernel-dev-25805dcf9d83098cf5492117ad2669cd14cc9b24.zip op-kernel-dev-25805dcf9d83098cf5492117ad2669cd14cc9b24.tar.gz |
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/r8169.c')
-rw-r--r-- | drivers/net/r8169.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 45876a8..5ec7752c 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -886,16 +886,6 @@ static void rtl8169_vlan_rx_register(struct net_device *dev, spin_unlock_irqrestore(&tp->lock, flags); } -static void rtl8169_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid) -{ - struct rtl8169_private *tp = netdev_priv(dev); - unsigned long flags; - - spin_lock_irqsave(&tp->lock, flags); - vlan_group_set_device(tp->vlgrp, vid, NULL); - spin_unlock_irqrestore(&tp->lock, flags); -} - static int rtl8169_rx_vlan_skb(struct rtl8169_private *tp, struct RxDesc *desc, struct sk_buff *skb) { @@ -1671,7 +1661,6 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) #ifdef CONFIG_R8169_VLAN dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX; dev->vlan_rx_register = rtl8169_vlan_rx_register; - dev->vlan_rx_kill_vid = rtl8169_vlan_rx_kill_vid; #endif #ifdef CONFIG_NET_POLL_CONTROLLER |