From 85d6ba349b00119f073a38617cc200ec0451cc30 Mon Sep 17 00:00:00 2001
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Thu, 12 Jan 2006 16:51:10 -0800
Subject: [PATCH] --- yaml --- r: 18811 b: refs/heads/master c:
 ff14701350eef6df9b7fc0ae118e1689e141a54c h: refs/heads/master i:   18809:
 787b7a6a004340b9eda3eb7e61499c282f4bdc8b   18807:
 ff9609b43c45432a9cc1d57ab60a3ef32adef286 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/e1000/e1000_main.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ac2946ee08fc..7dd24129336a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d74bbd3bbfd70470446e0d8153f91967d53c0798
+refs/heads/master: ff14701350eef6df9b7fc0ae118e1689e141a54c
diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c
index dd3d3232c94e..8190eb00d54f 100644
--- a/trunk/drivers/net/e1000/e1000_main.c
+++ b/trunk/drivers/net/e1000/e1000_main.c
@@ -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);