summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgnn <gnn@FreeBSD.org>2009-05-22 18:26:47 +0000
committergnn <gnn@FreeBSD.org>2009-05-22 18:26:47 +0000
commit56fa0af6738b5c4466957197aaa372d30e74440b (patch)
tree906ee218c37d12ca6eb5b1bc7c34f8f8d5817ced
parent0d99ad5f6663aea2bc97a2320b200d455a88d1a2 (diff)
downloadFreeBSD-src-56fa0af6738b5c4466957197aaa372d30e74440b.zip
FreeBSD-src-56fa0af6738b5c4466957197aaa372d30e74440b.tar.gz
Partial reversion of previous commit. The CXGB_SHUTDOWN flag does NOT
need to be inverted when doing an ifconfig down of an interface. Pointed out by: Navdeep Parhar MFC after: 1 week
-rw-r--r--sys/dev/cxgb/cxgb_main.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/sys/dev/cxgb/cxgb_main.c b/sys/dev/cxgb/cxgb_main.c
index 621fd38..3efcbb7 100644
--- a/sys/dev/cxgb/cxgb_main.c
+++ b/sys/dev/cxgb/cxgb_main.c
@@ -1905,7 +1905,6 @@ cxgb_init_locked(struct port_info *p)
callout_reset(&sc->cxgb_tick_ch, CXGB_TICKS(sc), cxgb_tick, sc);
t3_sge_reset_adapter(sc);
- sc->flags &= ~CXGB_SHUTDOWN;
ifp->if_drv_flags |= IFF_DRV_RUNNING;
ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
}
@@ -1926,13 +1925,10 @@ static void
cxgb_stop_locked(struct port_info *pi)
{
struct ifnet *ifp;
- adapter_t *sc = pi->adapter;
PORT_LOCK_ASSERT_OWNED(pi);
ADAPTER_LOCK_ASSERT_NOTOWNED(pi->adapter);
- sc->flags |= CXGB_SHUTDOWN;
-
ifp = pi->ifp;
t3_port_intr_disable(pi->adapter, pi->port_id);
ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE);
OpenPOWER on IntegriCloud