svn commit: r192593 - head/sys/dev/cxgb

George V. Neville-Neil gnn at FreeBSD.org
Fri May 22 18:26:48 UTC 2009


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);


More information about the svn-src-all mailing list