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

Commit 4666560a authored by Bruce Allan's avatar Bruce Allan Committed by Auke Kok
Browse files

e1000: don't strip vlan ID if 8021q claims it 



Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Signed-off-by: default avatarAuke Kok <auke-jan.h.kok@intel.com>
parent 2a88c173

drivers/net/e1000/e1000_main.c

+5 −1
Original line number Diff line number Diff line
@@ -1344,8 +1344,12 @@ e1000_close(struct net_device *netdev) 
	e1000_free_all_tx_resources(adapter);

	e1000_free_all_rx_resources(adapter);



	/* kill manageability vlan ID if supported, but not if a vlan with

	 * the same ID is registered on the host OS (let 8021q kill it) */

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

			  E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT)) {

			  E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) &&

	     !(adapter->vlgrp &&

			  adapter->vlgrp->vlan_devices[adapter->mng_vlan_id])) {

		e1000_vlan_rx_kill_vid(netdev, adapter->mng_vlan_id);

	}