From owner-p4-projects@FreeBSD.ORG  Tue Mar  6 13:13:51 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5BFE516A411; Tue,  6 Mar 2007 13:13:51 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 0856816A40F
	for <perforce@FreeBSD.org>; Tue,  6 Mar 2007 13:13:51 +0000 (UTC)
	(envelope-from sephe@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id EA34013C4C2
	for <perforce@FreeBSD.org>; Tue,  6 Mar 2007 13:13:50 +0000 (UTC)
	(envelope-from sephe@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l26DDogB004860
	for <perforce@FreeBSD.org>; Tue, 6 Mar 2007 13:13:50 GMT
	(envelope-from sephe@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l26DDoZa004851
	for perforce@freebsd.org; Tue, 6 Mar 2007 13:13:50 GMT
	(envelope-from sephe@FreeBSD.org)
Date: Tue, 6 Mar 2007 13:13:50 GMT
Message-Id: <200703061313.l26DDoZa004851@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sephe@FreeBSD.org using -f
From: Sepherosa Ziehau <sephe@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 115413 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: Tue, 06 Mar 2007 13:13:51 -0000

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

Change 115413 by sephe@sephe_zealot:sam_wifi on 2007/03/06 13:13:25

	- ic_bss is in STA table now.
	- Set ic_des_chan, even if the channel to be set to ic_des_chan is same
	  as ic_bsschan.
	
	Reviewed by:	sam@

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#69 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#69 (text+ko) ====

@@ -230,12 +230,8 @@
 	if (error != 0)
 		return error;
 	ni = ieee80211_find_node(&ic->ic_sta, macaddr);
-	if (ni == NULL) {
-		/* XXX special-case sta-mode until bss is node in ic_sta */
-		if (ic->ic_opmode != IEEE80211_M_STA)
-			return ENOENT;
-		ni = ieee80211_ref_node(ic->ic_bss);
-	}
+	if (ni == NULL)
+		return EINVAL;
 	if (ireq->i_len > sizeof(struct ieee80211req_sta_stats))
 		ireq->i_len = sizeof(struct ieee80211req_sta_stats);
 	/* NB: copy out only the statistics */
@@ -682,12 +678,8 @@
 		ni = NULL;
 	} else {
 		ni = ieee80211_find_node(&ic->ic_sta, macaddr);
-		if (ni == NULL) {
-			/* XXX special-case sta-mode until bss is in ic_sta */
-			if (ic->ic_opmode != IEEE80211_M_STA)
-				return EINVAL;		/* XXX */
-			ni = ieee80211_ref_node(ic->ic_bss);
-		}
+		if (ni == NULL)
+			return EINVAL;
 	}
 	return getstainfo_common(ic, ireq, ni, off);
 }
@@ -1736,9 +1728,9 @@
 		if (ic->ic_opmode == IEEE80211_M_HOSTAP &&
 		    !check_mode_consistency(c, ic->ic_des_mode))
 			return EINVAL;
+		ic->ic_des_chan = c;
 		if (ic->ic_state == IEEE80211_S_RUN && c == ic->ic_bsschan)
 			return 0;	/* NB: nothing to do */
-		ic->ic_des_chan = c;
 	}
 	error = 0;
 	if ((ic->ic_opmode == IEEE80211_M_MONITOR ||
@@ -1787,9 +1779,9 @@
 		if (ic->ic_opmode == IEEE80211_M_HOSTAP &&
 		    !check_mode_consistency(c, ic->ic_des_mode))
 			return EINVAL;
+		ic->ic_des_chan = c;
 		if (ic->ic_state == IEEE80211_S_RUN && c == ic->ic_bsschan)
 			return 0;	/* NB: nothing to do */
-		ic->ic_des_chan = c;
 	}
 	error = 0;
 	if ((ic->ic_opmode == IEEE80211_M_MONITOR ||