From b1914fb188ac8ae6569b4012d9f708a84e463089 Mon Sep 17 00:00:00 2001 From: Bruce Allan Date: Wed, 27 Sep 2006 12:54:08 -0700 Subject: [PATCH] --- yaml --- r: 37961 b: refs/heads/master c: 4666560a37dfdc748ae7c1d9f09c7b6ff03ce899 h: refs/heads/master i: 37959: 0e04d77a89d2aa94f59b29abcac02dd28789232c 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 6dba37772c87..3aeff2c5bec4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2a88c17371c3c263c28330093a4cd21bbeceb677 +refs/heads/master: 4666560a37dfdc748ae7c1d9f09c7b6ff03ce899 diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c index 5098dd7df7cd..593bfbeef8d4 100644 --- a/trunk/drivers/net/e1000/e1000_main.c +++ b/trunk/drivers/net/e1000/e1000_main.c @@ -1344,8 +1344,12 @@ e1000_close(struct net_device *netdev) e1000_free_all_tx_resources(adapter); e1000_free_all_rx_resources(adapter); + /* kill manageability vlan ID if supported, but not if a vlan with + * the same ID is registered on the host OS (let 8021q kill it) */ if ((adapter->hw.mng_cookie.status & - E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT)) { + E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) && + !(adapter->vlgrp && + adapter->vlgrp->vlan_devices[adapter->mng_vlan_id])) { e1000_vlan_rx_kill_vid(netdev, adapter->mng_vlan_id); }