From owner-p4-projects@FreeBSD.ORG  Sun May  6 20:26:34 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 5F4B716A408; Sun,  6 May 2007 20:26:34 +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 3D6E216A404
	for <perforce@freebsd.org>; Sun,  6 May 2007 20:26:34 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 2EC7713C459
	for <perforce@freebsd.org>; Sun,  6 May 2007 20:26:34 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l46KQY7C094628
	for <perforce@freebsd.org>; Sun, 6 May 2007 20:26:34 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l46KQXYj094622
	for perforce@freebsd.org; Sun, 6 May 2007 20:26:33 GMT
	(envelope-from sam@freebsd.org)
Date: Sun, 6 May 2007 20:26:33 GMT
Message-Id: <200705062026.l46KQXYj094622@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 119367 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, 06 May 2007 20:26:34 -0000

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

Change 119367 by sam@sam_ebb on 2007/05/06 20:25:33

	o correct problem where channel change ioctl didn't do anything
	  if new channel was bss chan
	o remove duplicate logic

Affected files ...

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

Differences ...

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

@@ -1677,7 +1677,7 @@
 		if (ic->ic_opmode == IEEE80211_M_HOSTAP &&
 		    !check_mode_consistency(c, ic->ic_des_mode))
 			return EINVAL;
-		if (ic->ic_state == IEEE80211_S_RUN && c == ic->ic_bsschan)
+		if (ic->ic_state == IEEE80211_S_RUN && c == ic->ic_curchan)
 			return 0;	/* NB: nothing to do */
 	}
 	ic->ic_des_chan = c;
@@ -1763,12 +1763,6 @@
 		default:		/* NB: no static turboG */
 			break;
 		}
-		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 */
 	}
 	return setcurchan(ic, c);
 }