From owner-svn-src-head@freebsd.org  Wed Jan  4 08:08:51 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 DF620C9EB93;
 Wed,  4 Jan 2017 08:08:51 +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 AF23E12BE;
 Wed,  4 Jan 2017 08:08:51 +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 v0488oMp070805;
 Wed, 4 Jan 2017 08:08:50 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0488oGU070804;
 Wed, 4 Jan 2017 08:08:50 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201701040808.v0488oGU070804@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: Wed, 4 Jan 2017 08:08:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r311266 - head/sys/net80211
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Jan 2017 08:08:52 -0000

Author: adrian
Date: Wed Jan  4 08:08:50 2017
New Revision: 311266
URL: https://svnweb.freebsd.org/changeset/base/311266

Log:
  [net80211] Add VHT flags for printf/debugging.
  
  Whilst here, note that the last bit is currently used by ifconfig (_CHAN_HT)
  so don't use it without fixing that first.

Modified:
  head/sys/net80211/_ieee80211.h

Modified: head/sys/net80211/_ieee80211.h
==============================================================================
--- head/sys/net80211/_ieee80211.h	Wed Jan  4 08:07:48 2017	(r311265)
+++ head/sys/net80211/_ieee80211.h	Wed Jan  4 08:08:50 2017	(r311266)
@@ -194,6 +194,7 @@ struct ieee80211_channel {
 #define	IEEE80211_CHAN_VHT80	0x08000000 /* VHT80 channel */
 #define	IEEE80211_CHAN_VHT80_80	0x10000000 /* VHT80+80 channel */
 #define	IEEE80211_CHAN_VHT160	0x20000000 /* VHT160 channel */
+/* XXX note: 0x80000000 is used in src/sbin/ifconfig/ifieee80211.c :( */
 
 #define	IEEE80211_CHAN_HT40	(IEEE80211_CHAN_HT40U | IEEE80211_CHAN_HT40D)
 #define	IEEE80211_CHAN_HT	(IEEE80211_CHAN_HT20 | IEEE80211_CHAN_HT40)
@@ -206,8 +207,8 @@ struct ieee80211_channel {
 #define	IEEE80211_CHAN_BITS \
 	"\20\1PRIV0\2PRIV2\3PRIV3\4PRIV4\5TURBO\6CCK\7OFDM\0102GHZ\0115GHZ" \
 	"\12PASSIVE\13DYN\14GFSK\15GSM\16STURBO\17HALF\20QUARTER\21HT20" \
-	"\22HT40U\23HT40D\24DFS\0254MSXMIT\26NOADHOC\27NOHOSTAP\03011D"
-/* XXX TODO: add VHT bits */
+	"\22HT40U\23HT40D\24DFS\0254MSXMIT\26NOADHOC\27NOHOSTAP\03011D" \
+	"\031VHT20\032VHT40U\033VHT40D\034VHT80\035VHT80_80\036VHT160"
 
 /*
  * Useful combinations of channel characteristics.