From owner-p4-projects@FreeBSD.ORG  Thu Jan 11 07:27:42 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 E437616A415; Thu, 11 Jan 2007 07:27:41 +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 BE1B916A403
	for <perforce@freebsd.org>; Thu, 11 Jan 2007 07:27:41 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id AE41513C448
	for <perforce@freebsd.org>; Thu, 11 Jan 2007 07:27:41 +0000 (UTC)
	(envelope-from kmacy@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 l0B7RfOr089583
	for <perforce@freebsd.org>; Thu, 11 Jan 2007 07:27:41 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0B7Rfhv089580
	for perforce@freebsd.org; Thu, 11 Jan 2007 07:27:41 GMT
	(envelope-from kmacy@freebsd.org)
Date: Thu, 11 Jan 2007 07:27:41 GMT
Message-Id: <200701110727.l0B7Rfhv089580@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 112766 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: Thu, 11 Jan 2007 07:27:42 -0000

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

Change 112766 by kmacy@kmacy_netherworld:sam_wifi on 2007/01/11 07:26:57

	don't send beacon update if the bss channel is not set

Affected files ...

.. //depot/projects/wifi/sys/dev/ral/rt2560.c#11 edit

Differences ...

==== //depot/projects/wifi/sys/dev/ral/rt2560.c#11 (text) ====

@@ -1266,9 +1266,14 @@
 
 	if (ic->ic_opmode != IEEE80211_M_IBSS &&
 	    ic->ic_opmode != IEEE80211_M_HOSTAP)
-		return;
+		return;	
 
 	data = &sc->bcnq.data[sc->bcnq.next];
+	/*
+	 * Don't send beacon if bsschan isn't set
+	 */
+	if (data->ni == NULL)
+	        return;
 
 	bus_dmamap_sync(sc->bcnq.data_dmat, data->map, BUS_DMASYNC_POSTWRITE);
 	bus_dmamap_unload(sc->bcnq.data_dmat, data->map);