lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

network drivers: eliminate unneeded kill_vid code

Browse Source 
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>
This commit is contained in:
Stephen Hemminger
2007-06-01 09:44:01 -07:00
committed by Jeff Garzik
parent cb434e380d
commit 25805dcf9d
14 changed files with 6 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/net/spider_net.c
View File

@@ -1190,43 +1190,6 @@ spider_net_poll(struct net_device *netdev, int *budget)
return 1;
}
/**
* 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;