---

yaml --- r: 18811 b: refs/heads/master c: ff14701 h: refs/heads/master i: 18809: 787b7a6 18807: ff9609b v: v3
git-mirror · Jan 17, 2006 · 85d6ba3 · 85d6ba3
1 parent de3020b
commit 85d6ba3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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);