From owner-svn-src-user@FreeBSD.ORG  Tue Jan 20 21:51:01 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 76C2010656C5;
	Tue, 20 Jan 2009 21:51:01 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 66C318FC0C;
	Tue, 20 Jan 2009 21:51:01 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0KLp1PU057536;
	Tue, 20 Jan 2009 21:51:01 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0KLp18N057535;
	Tue, 20 Jan 2009 21:51:01 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200901202151.n0KLp18N057535@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Tue, 20 Jan 2009 21:51:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187487 - user/sam/wifi/sys/net80211
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Jan 2009 21:51:02 -0000

Author: sam
Date: Tue Jan 20 21:51:01 2009
New Revision: 187487
URL: http://svn.freebsd.org/changeset/base/187487

Log:
  fill in ieee channel #'s and max tx power for drivers that work exclusively
  with frequencies; this mimics how ieee80211_setregdomain works

Modified:
  user/sam/wifi/sys/net80211/ieee80211.c

Modified: user/sam/wifi/sys/net80211/ieee80211.c
==============================================================================
--- user/sam/wifi/sys/net80211/ieee80211.c	Tue Jan 20 21:37:41 2009	(r187486)
+++ user/sam/wifi/sys/net80211/ieee80211.c	Tue Jan 20 21:51:01 2009	(r187487)
@@ -126,6 +126,21 @@ ieee80211_chan_init(struct ieee80211com 
 	for (i = 0; i < ic->ic_nchans; i++) {
 		c = &ic->ic_channels[i];
 		KASSERT(c->ic_flags != 0, ("channel with no flags"));
+		/*
+		 * Help drivers that work only with frequencies by filling
+		 * in IEEE channel #'s if not already calculated.  Note this
+		 * mimics similar work done in ieee80211_setregdomain when
+		 * changing regulatory state.
+		 */
+		if (c->ic_ieee == 0)
+			c->ic_ieee = ieee80211_mhz2ieee(c->ic_freq,c->ic_flags);
+		if (IEEE80211_IS_CHAN_HT40(c) && c->ic_extieee == 0)
+			c->ic_extieee = ieee80211_mhz2ieee(c->ic_freq +
+			    (IEEE80211_IS_CHAN_HT40U(c) ? 20 : -20),
+			    c->ic_flags);
+		/* default max tx power to max regulatory */
+		if (c->ic_maxpower == 0)
+			c->ic_maxpower = 2*c->ic_maxregpower;
 		setbit(ic->ic_chan_avail, c->ic_ieee);
 		/*
 		 * Identify mode capabilities.