From owner-svn-src-head@FreeBSD.ORG  Tue Jun  2 20:51:59 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D7B6F106567F;
	Tue,  2 Jun 2009 20:51:59 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C5FDB8FC0A;
	Tue,  2 Jun 2009 20:51:59 +0000 (UTC) (envelope-from sam@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 n52KpxFq028052;
	Tue, 2 Jun 2009 20:51:59 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n52Kpxcd028051;
	Tue, 2 Jun 2009 20:51:59 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200906022051.n52Kpxcd028051@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Tue, 2 Jun 2009 20:51:59 +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: r193348 - head/sys/net80211
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Jun 2009 20:52:00 -0000

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);
 }
 
 /*