From a236222b4460b045f2e185279123275e91023bd0 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Fri, 1 Jun 2007 09:43:57 -0700 Subject: [PATCH] VLAN: kill_vid is only useful for VLAN filtering devices The interface for network device VLAN extension was confusing. The kill_vid function is only really useful for devices that do hardware filtering. Devices that only do VLAN receiption without filtering were being forced to provide the hook, and there were bugs in those devices. Many drivers had kill_vid routine that called vlan_group_set_device, with NULL, but that is done already. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik --- net/8021q/vlan.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index bd93c45778d4e..ceef57c9ab326 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c @@ -240,10 +240,8 @@ static int unregister_vlan_dev(struct net_device *real_dev, * interlock with HW accelerating devices or SW vlan * input packet processing. */ - if (real_dev->features & - (NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER)) { + if (real_dev->features & NETIF_F_HW_VLAN_FILTER) real_dev->vlan_rx_kill_vid(real_dev, vlan_id); - } vlan_group_set_device(grp, vlan_id, NULL); synchronize_net(); @@ -409,16 +407,14 @@ static struct net_device *register_vlan_device(const char *eth_IF_name, } if ((real_dev->features & NETIF_F_HW_VLAN_RX) && - (real_dev->vlan_rx_register == NULL || - real_dev->vlan_rx_kill_vid == NULL)) { + !real_dev->vlan_rx_register) { printk(VLAN_DBG "%s: Device %s has buggy VLAN hw accel.\n", __FUNCTION__, real_dev->name); goto out_put_dev; } if ((real_dev->features & NETIF_F_HW_VLAN_FILTER) && - (real_dev->vlan_rx_add_vid == NULL || - real_dev->vlan_rx_kill_vid == NULL)) { + (!real_dev->vlan_rx_add_vid || !real_dev->vlan_rx_kill_vid)) { printk(VLAN_DBG "%s: Device %s has buggy VLAN hw accel.\n", __FUNCTION__, real_dev->name); goto out_put_dev; -- 2.39.5