---

yaml --- r: 21246 b: refs/heads/master c: c5f226f h: refs/heads/master v: v3
git-mirror · Mar 3, 2006 · 5268966 · 5268966
1 parent 071916e
commit 5268966
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b66ba0db8d04d99926445bc7d9f920bb5d744ed
+refs/heads/master: c5f226fe97e8025440aa330aa2c8e1c66bfdc96b
diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c
@@ -373,7 +373,8 @@ e1000_update_mng_vlan(struct e1000_adapter *adapter)
 					(vid != old_vid) &&
 					!adapter->vlgrp->vlan_devices[old_vid])
 				e1000_vlan_rx_kill_vid(netdev, old_vid);
-		}
+		} else
+			adapter->mng_vlan_id = vid;
 	}
 }