From owner-svn-src-all@FreeBSD.ORG Fri May 22 18:26:48 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 34167106566C; Fri, 22 May 2009 18:26:48 +0000 (UTC) (envelope-from gnn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 212E18FC1A; Fri, 22 May 2009 18:26:48 +0000 (UTC) (envelope-from gnn@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4MIQmtm014831; Fri, 22 May 2009 18:26:48 GMT (envelope-from gnn@svn.freebsd.org) Received: (from gnn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4MIQmp0014830; Fri, 22 May 2009 18:26:48 GMT (envelope-from gnn@svn.freebsd.org) Message-Id: <200905221826.n4MIQmp0014830@svn.freebsd.org> From: "George V. Neville-Neil" Date: Fri, 22 May 2009 18:26:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192593 - head/sys/dev/cxgb X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 May 2009 18:26:48 -0000 Author: gnn Date: Fri May 22 18:26:47 2009 New Revision: 192593 URL: http://svn.freebsd.org/changeset/base/192593 Log: 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 Modified: head/sys/dev/cxgb/cxgb_main.c Modified: head/sys/dev/cxgb/cxgb_main.c ============================================================================== --- head/sys/dev/cxgb/cxgb_main.c Fri May 22 18:19:20 2009 (r192592) +++ head/sys/dev/cxgb/cxgb_main.c Fri May 22 18:26:47 2009 (r192593) @@ -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);