Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff147013 authored by Jeff Kirsher's avatar Jeff Kirsher Committed by Jeff Garzik
Browse files

[PATCH] e1000: Fix VLAN support 



Fixed VLAN support by switching control over to the firmware.

Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarJohn Ronciak <john.ronciak@intel.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent d74bbd3b

drivers/net/e1000/e1000_main.c

+5 −1
Original line number Diff line number Diff line
@@ -4245,8 +4245,12 @@ e1000_vlan_rx_kill_vid(struct net_device *netdev, uint16_t vid) 


	if((adapter->hw.mng_cookie.status &

		E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) &&

		(vid == adapter->mng_vlan_id))

	    (vid == adapter->mng_vlan_id)) {

		/* release control to f/w */

		e1000_release_hw_control(adapter);

		return;

	}



	/* remove VID from filter table */

	index = (vid >> 5) & 0x7F;

	vfta = E1000_READ_REG_ARRAY(&adapter->hw, VFTA, index);