From owner-svn-src-all@freebsd.org  Sat May 14 23:50:17 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1D844B3B731;
 Sat, 14 May 2016 23:50:17 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E275B17D3;
 Sat, 14 May 2016 23:50:16 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4ENoGPb091456;
 Sat, 14 May 2016 23:50:16 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4ENoGa1091455;
 Sat, 14 May 2016 23:50:16 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201605142350.u4ENoGa1091455@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: adrian set sender to
 adrian@FreeBSD.org using -f
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sat, 14 May 2016 23:50:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r299800 - head/sys/dev/bwn
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 May 2016 23:50:17 -0000

Author: adrian
Date: Sat May 14 23:50:15 2016
New Revision: 299800
URL: https://svnweb.freebsd.org/changeset/base/299800

Log:
  [bwn] disable 11na channel setup for now, since we definitely, positively
  don't do 11na yet.

Modified:
  head/sys/dev/bwn/if_bwn.c

Modified: head/sys/dev/bwn/if_bwn.c
==============================================================================
--- head/sys/dev/bwn/if_bwn.c	Sat May 14 23:48:26 2016	(r299799)
+++ head/sys/dev/bwn/if_bwn.c	Sat May 14 23:50:15 2016	(r299800)
@@ -388,6 +388,7 @@ static const struct bwn_channelinfo bwn_
 	.nchannels = 37
 };
 
+#if 0
 static const struct bwn_channelinfo bwn_chantable_n = {
 	.channels = {
 		{ 5160,  32, 30 }, { 5170,  34, 30 }, { 5180,  36, 30 },
@@ -429,6 +430,7 @@ static const struct bwn_channelinfo bwn_
 		{ 6130, 226, 30 }, { 6140, 228, 30 } },
 	.nchannels = 110
 };
+#endif
 
 #define	VENDOR_LED_ACT(vendor)				\
 {							\
@@ -1450,6 +1452,7 @@ bwn_setup_channels(struct bwn_mac *mac, 
 	if (have_bg)
 		bwn_addchannels(ic->ic_channels, IEEE80211_CHAN_MAX,
 		    &ic->ic_nchans, &bwn_chantable_bg, IEEE80211_CHAN_G);
+#if 0
 	if (mac->mac_phy.type == BWN_PHYTYPE_N) {
 		if (have_a)
 			bwn_addchannels(ic->ic_channels, IEEE80211_CHAN_MAX,
@@ -1461,6 +1464,11 @@ bwn_setup_channels(struct bwn_mac *mac, 
 			    &ic->ic_nchans, &bwn_chantable_a,
 			    IEEE80211_CHAN_A);
 	}
+#endif
+	if (have_a)
+		bwn_addchannels(ic->ic_channels, IEEE80211_CHAN_MAX,
+		    &ic->ic_nchans, &bwn_chantable_a,
+		    IEEE80211_CHAN_A);
 
 	mac->mac_phy.supports_2ghz = have_bg;
 	mac->mac_phy.supports_5ghz = have_a;