Commit d2d1acdb authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Jeff Garzik
Browse files

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: default avatarStephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent e68a8c10

net/8021q/vlan.c

+3 −7
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE