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: Sun, 14 Feb 2010 09:35:24 +0000 (UTC)

 Author: gavin
 Date: Sun Feb 14 09:34:27 2010
 New Revision: 203855
 URL: http://svn.freebsd.org/changeset/base/203855
 
 Log:
   Merge r200530 from head:
   
     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 PRs, but not the attach failure.
   
   PR:		kern/139079, kern/143874
   Tested by:	Steven Noonan <steven uplinklabs.net>
   Reviewed by:	thompsa
 
 Modified:
   stable/8/sys/dev/wpi/if_wpi.c
 Directory Properties:
   stable/8/sys/   (props changed)
   stable/8/sys/amd64/include/xen/   (props changed)
   stable/8/sys/cddl/contrib/opensolaris/   (props changed)
   stable/8/sys/contrib/dev/acpica/   (props changed)
   stable/8/sys/contrib/pf/   (props changed)
   stable/8/sys/dev/xen/xenpci/   (props changed)
   stable/8/sys/netinet/   (props changed)
 
 Modified: stable/8/sys/dev/wpi/if_wpi.c
 ==============================================================================
 --- stable/8/sys/dev/wpi/if_wpi.c	Sun Feb 14 07:20:58 2010	(r203854)
 +++ stable/8/sys/dev/wpi/if_wpi.c	Sun Feb 14 09:34:27 2010	(r203855)
 @@ -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"