From owner-p4-projects@FreeBSD.ORG  Sun Jan 27 20:30:00 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 83E7116A469; Sun, 27 Jan 2008 20:30:00 +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 47E5816A421
	for <perforce@freebsd.org>; Sun, 27 Jan 2008 20:30:00 +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 38F3B13C47E
	for <perforce@freebsd.org>; Sun, 27 Jan 2008 20:30:00 +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 m0RKU0tR038087
	for <perforce@freebsd.org>; Sun, 27 Jan 2008 20:30:00 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0RKU049038084
	for perforce@freebsd.org; Sun, 27 Jan 2008 20:30:00 GMT
	(envelope-from sam@freebsd.org)
Date: Sun, 27 Jan 2008 20:30:00 GMT
Message-Id: <200801272030.m0RKU049038084@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 134235 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: Sun, 27 Jan 2008 20:30:00 -0000

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

Change 134235 by sam@sam_ebb on 2008/01/27 20:29:58

	fix handling of DWDS vaps when remote ap goes away (e.g. on
	channel change); we usually cannot re-create the vap state
	because the peer ap is not present; reflect this through the
	error code returned by wds_newstate, drivers must check the
	return status and do the right thing

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_wds.c#5 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_wds.c#5 (text+ko) ====

@@ -95,7 +95,7 @@
 	vap->iv_opdetach = wds_vdetach;
 }
 
-static void
+static int
 ieee80211_create_wds(struct ieee80211vap *vap, struct ieee80211_channel *chan)
 {
 	struct ieee80211com *ic = vap->iv_ic;
@@ -214,6 +214,7 @@
 			ieee80211_input(ni, m, rssi, noise, ni->ni_rstamp);
 		}
 	}
+	return (ni == NULL ? ENOENT : 0);
 }
 
 /*
@@ -390,6 +391,7 @@
 	struct ieee80211com *ic = vap->iv_ic;
 	struct ieee80211_node *ni;
 	enum ieee80211_state ostate;
+	int error;
 
 	IEEE80211_LOCK_ASSERT(ic);
 
@@ -403,6 +405,7 @@
 	ni = vap->iv_bss;			/* NB: no reference held */
 	if (vap->iv_flags_ext & IEEE80211_FEXT_SWBMISS)
 		callout_stop(&vap->iv_swbmiss);
+	error = 0;
 	switch (nstate) {
 	case IEEE80211_S_INIT:
 		switch (ostate) {
@@ -432,13 +435,13 @@
 			 * Already have a channel; bypass the scan
 			 * and startup immediately.
 			 */
-			ieee80211_create_wds(vap, ic->ic_curchan);
+			error = ieee80211_create_wds(vap, ic->ic_curchan);
 		}
 		break;
 	default:
 		break;
 	}
-	return 0;
+	return error;
 }
 
 /*