From 7529967798a61ad246cb189f9d67e11fedc2d710 Mon Sep 17 00:00:00 2001 From: "George V. Neville-Neil" Date: Fri, 22 May 2009 18:26:47 +0000 Subject: [PATCH] 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 --- sys/dev/cxgb/cxgb_main.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/dev/cxgb/cxgb_main.c b/sys/dev/cxgb/cxgb_main.c index 621fd389cfab..3efcbb73ccf5 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);