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/spider_net.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/spider_net.c')
| -rw-r--r-- | drivers/net/spider_net.c | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c index ef84d7c..b47ad1d 100644 --- a/drivers/net/spider_net.c +++ b/drivers/net/spider_net.c @@ -1191,43 +1191,6 @@ spider_net_poll(struct net_device *netdev, int *budget) } /** - * spider_net_vlan_rx_reg - initializes VLAN structures in the driver and card - * @netdev: interface device structure - * @grp: vlan_group structure that is registered (NULL on destroying interface) - */ -static void -spider_net_vlan_rx_reg(struct net_device *netdev, struct vlan_group *grp) -{ - /* further enhancement... yet to do */ - return; -} - -/** - * spider_net_vlan_rx_add - adds VLAN id to the card filter - * @netdev: interface device structure - * @vid: VLAN id to add - */ -static void -spider_net_vlan_rx_add(struct net_device *netdev, uint16_t vid) -{ - /* further enhancement... yet to do */ - /* add vid to card's VLAN filter table */ - return; -} - -/** - * spider_net_vlan_rx_kill - removes VLAN id to the card filter - * @netdev: interface device structure - * @vid: VLAN id to remove - */ -static void -spider_net_vlan_rx_kill(struct net_device *netdev, uint16_t vid) -{ - /* further enhancement... yet to do */ - /* remove vid from card's VLAN filter table */ -} - -/** * spider_net_get_stats - get interface statistics * @netdev: interface device structure * @@ -2177,9 +2140,6 @@ spider_net_setup_netdev_ops(struct net_device *netdev) netdev->poll = &spider_net_poll; netdev->weight = SPIDER_NET_NAPI_WEIGHT; /* HW VLAN */ - netdev->vlan_rx_register = &spider_net_vlan_rx_reg; - netdev->vlan_rx_add_vid = &spider_net_vlan_rx_add; - netdev->vlan_rx_kill_vid = &spider_net_vlan_rx_kill; #ifdef CONFIG_NET_POLL_CONTROLLER /* poll controller */ netdev->poll_controller = &spider_net_poll_controller; |
