kern/139079: commit references a PR

[dfilter service]

The following reply was made to PR kern/139079; it has been noted by GNATS.

From: dfilter at FreeBSD.ORG (dfilter service)
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: kern/139079: commit references a PR
Date: Mon, 14 Dec 2009 19:18:15 +0000 (UTC)

 Author: gavin
 Date: Mon Dec 14 19:18:02 2009
 New Revision: 200530
 URL: http://svn.freebsd.org/changeset/base/200530
 
 Log:
   Don't panic on failure to attach if we fail before or during the
   if_alloc() of ifp.  This fixes the panic reported in the PR, but
   not the attach failure.
   
   PR:		kern/139079
   Tested by:      Steven Noonan <steven uplinklabs.net>
   Reviewed by:	thompsa
   Approved by:	ed (mentor)
   MFC after:	2 weeks`
 
 Modified:
   head/sys/dev/wpi/if_wpi.c
 
 Modified: head/sys/dev/wpi/if_wpi.c
 ==============================================================================
 --- head/sys/dev/wpi/if_wpi.c	Mon Dec 14 19:08:11 2009	(r200529)
 +++ head/sys/dev/wpi/if_wpi.c	Mon Dec 14 19:18:02 2009	(r200530)
 @@ -713,13 +713,14 @@ wpi_detach(device_t dev)
  {
  	struct wpi_softc *sc = device_get_softc(dev);
  	struct ifnet *ifp = sc->sc_ifp;
 -	struct ieee80211com *ic = ifp->if_l2com;
 +	struct ieee80211com *ic;
  	int ac;
  
 -	ieee80211_draintask(ic, &sc->sc_restarttask);
 -	ieee80211_draintask(ic, &sc->sc_radiotask);
 -
  	if (ifp != NULL) {
 +		ic = ifp->if_l2com;
 +
 +		ieee80211_draintask(ic, &sc->sc_restarttask);
 +		ieee80211_draintask(ic, &sc->sc_radiotask);
  		wpi_stop(sc);
  		callout_drain(&sc->watchdog_to);
  		callout_drain(&sc->calib_to);
 _______________________________________________
 svn-src-all at freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe at freebsd.org"