svn commit: r193348 - head/sys/net80211

Sam Leffler sam at FreeBSD.org
Tue Jun 2 20:52:00 UTC 2009


Author: sam
Date: Tue Jun  2 20:51:59 2009
New Revision: 193348
URL: http://svn.freebsd.org/changeset/base/193348

Log:
  remove another vestige of the null if_softc on detach hack

Modified:
  head/sys/net80211/ieee80211_proto.c

Modified: head/sys/net80211/ieee80211_proto.c
==============================================================================
--- head/sys/net80211/ieee80211_proto.c	Tue Jun  2 20:48:12 2009	(r193347)
+++ head/sys/net80211/ieee80211_proto.c	Tue Jun  2 20:51:59 2009	(r193348)
@@ -1220,22 +1220,12 @@ ieee80211_init(void *arg)
 {
 	struct ieee80211vap *vap = arg;
 
-	/*
-	 * This routine is publicly accessible through the vap's
-	 * if_init method so guard against calls during detach.
-	 * ieee80211_vap_detach null's the backpointer before
-	 * tearing down state to signal any callback should be
-	 * rejected/ignored.
-	 */
-	if (vap != NULL) {
-		IEEE80211_DPRINTF(vap,
-		    IEEE80211_MSG_STATE | IEEE80211_MSG_DEBUG,
-		    "%s\n", __func__);
-
-		IEEE80211_LOCK(vap->iv_ic);
-		ieee80211_start_locked(vap);
-		IEEE80211_UNLOCK(vap->iv_ic);
-	}
+	IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE | IEEE80211_MSG_DEBUG,
+	    "%s\n", __func__);
+
+	IEEE80211_LOCK(vap->iv_ic);
+	ieee80211_start_locked(vap);
+	IEEE80211_UNLOCK(vap->iv_ic);
 }
 
 /*


More information about the svn-src-head mailing list