aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000
diff options
context:
space:
mode:
authorJeff Kirsher <jeffrey.t.kirsher@intel.com>2006-03-02 18:17:55 -0800
committerroot <root@jk-desktop.jf.intel.com>2006-03-02 18:17:55 -0800
commitc5f226fe97e8025440aa330aa2c8e1c66bfdc96b (patch)
treeda2a45df3a52529dec850bea57e1ec7f8bbf9b38 /drivers/net/e1000
parent5b66ba0db8d04d99926445bc7d9f920bb5d744ed (diff)
downloadkernel_samsung_smdk4412-c5f226fe97e8025440aa330aa2c8e1c66bfdc96b.zip
kernel_samsung_smdk4412-c5f226fe97e8025440aa330aa2c8e1c66bfdc96b.tar.gz
kernel_samsung_smdk4412-c5f226fe97e8025440aa330aa2c8e1c66bfdc96b.tar.bz2
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>
Diffstat (limited to 'drivers/net/e1000')
-rw-r--r--drivers/net/e1000/e1000_main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index af87eb0..0109cc7 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;
}
}