From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Fri, 3 Mar 2006 02:17:55 +0000 (-0800)
Subject: e1000: Fix AMT losing connectivity when switching VLAN in passive mode
X-Git-Tag: v2.6.17-rc1~1186^2~45
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=c5f226fe97e8025440aa330aa2c8e1c66bfdc96b;p=linux-2.6-omap-h63xx.git

e1000: Fix AMT losing connectivity when switching VLAN in passive mode


Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
---

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index af87eb04d83..0109cc72746 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/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;
 	}
 }