From owner-p4-projects@FreeBSD.ORG  Fri Apr  4 18:56:54 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6DF3A1065716; Fri,  4 Apr 2008 18:56:53 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8C0621065670
	for <perforce@freebsd.org>; Fri,  4 Apr 2008 18:56:53 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 73CEE8FC18
	for <perforce@freebsd.org>; Fri,  4 Apr 2008 18:56:53 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m34IurLW095352
	for <perforce@freebsd.org>; Fri, 4 Apr 2008 18:56:53 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m34Iurve095350
	for perforce@freebsd.org; Fri, 4 Apr 2008 18:56:53 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 4 Apr 2008 18:56:53 GMT
Message-Id: <200804041856.m34Iurve095350@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 139365 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Apr 2008 18:56:54 -0000

http://perforce.freebsd.org/chv.cgi?CH=139365

Change 139365 by sam@sam_ebb on 2008/04/04 18:56:32

	handle ieee80211_vap_setup failing

Affected files ...

.. //depot/projects/vap/sys/dev/ath/if_ath.c#59 edit

Differences ...

==== //depot/projects/vap/sys/dev/ath/if_ath.c#59 (text+ko) ====

@@ -780,7 +780,7 @@
 	struct ath_vap *avp;
 	struct ieee80211vap *vap;
 	uint8_t mac[IEEE80211_ADDR_LEN];
-	int ic_opmode, needbeacon;
+	int ic_opmode, needbeacon, error;
 
 	avp = (struct ath_vap *) malloc(sizeof(struct ath_vap),
 	    M_80211_VAP, M_WAITOK | M_ZERO);
@@ -865,9 +865,14 @@
 	vap = &avp->av_vap;
 	/* XXX can't hold mutex across if_alloc */
 	ATH_UNLOCK(sc);
-	/* XXX check return */
-	ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, bssid, mac);
+	error = ieee80211_vap_setup(ic, vap, name, unit, opmode, flags,
+	    bssid, mac);
 	ATH_LOCK(sc);
+	if (error != 0) {
+		device_printf(sc->sc_dev, "%s: error %d creating vap\n",
+		    __func__, error);
+		goto bad2;
+	}
 
 	/* h/w crypto support */
 	vap->iv_key_alloc = ath_key_alloc;
@@ -952,6 +957,9 @@
 	/* complete setup */
 	ieee80211_vap_attach(vap, ath_media_change, ieee80211_media_status);
 	return vap;
+bad2:
+	reclaim_address(sc, mac);
+	ath_hal_setbssidmask(sc->sc_ah, sc->sc_hwbssidmask);
 bad:
 	free(avp, M_80211_VAP);
 	ATH_UNLOCK(sc);