svn commit: r187759 - user/sam/wifi/sys/net80211
Sam Leffler
sam at FreeBSD.org
Mon Jan 26 18:09:53 PST 2009
Author: sam
Date: Tue Jan 27 02:09:52 2009
New Revision: 187759
URL: http://svn.freebsd.org/changeset/base/187759
Log:
o make %b msg bit defines public (to user apps too)
o rename IEEE80211_C_CRYPTO_BITS to IEEE80211_CRYPTO_BITS; not sure why
I had it the way it was
Modified:
user/sam/wifi/sys/net80211/_ieee80211.h
user/sam/wifi/sys/net80211/ieee80211.h
user/sam/wifi/sys/net80211/ieee80211_crypto.h
user/sam/wifi/sys/net80211/ieee80211_ddb.c
user/sam/wifi/sys/net80211/ieee80211_ht.h
user/sam/wifi/sys/net80211/ieee80211_node.h
user/sam/wifi/sys/net80211/ieee80211_var.h
Modified: user/sam/wifi/sys/net80211/_ieee80211.h
==============================================================================
--- user/sam/wifi/sys/net80211/_ieee80211.h Tue Jan 27 01:45:43 2009 (r187758)
+++ user/sam/wifi/sys/net80211/_ieee80211.h Tue Jan 27 02:09:52 2009 (r187759)
@@ -175,6 +175,11 @@ struct ieee80211_channel {
#define IEEE80211_CHAN_HT40 (IEEE80211_CHAN_HT40U | IEEE80211_CHAN_HT40D)
#define IEEE80211_CHAN_HT (IEEE80211_CHAN_HT20 | IEEE80211_CHAN_HT40)
+#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"
+
/*
* Useful combinations of channel characteristics.
*/
Modified: user/sam/wifi/sys/net80211/ieee80211.h
==============================================================================
--- user/sam/wifi/sys/net80211/ieee80211.h Tue Jan 27 01:45:43 2009 (r187758)
+++ user/sam/wifi/sys/net80211/ieee80211.h Tue Jan 27 02:09:52 2009 (r187759)
@@ -502,6 +502,11 @@ struct ieee80211_frame_bar {
#define IEEE80211_CAPINFO_DSSSOFDM 0x2000
/* bits 14-15 are reserved */
+#define IEEE80211_CAPINFO_BITS \
+ "\20\1ESS\2IBSS\3CF_POLLABLE\4CF_POLLREQ\5PRIVACY\6SHORT_PREAMBLE" \
+ "\7PBCC\10CHNL_AGILITY\11SPECTRUM_MGMT\13SHORT_SLOTTIME\14RSN" \
+ "\16DSSOFDM"
+
/*
* 802.11i/WPA information element (maximally sized).
*/
@@ -562,6 +567,11 @@ struct ieee80211_ie_htcap {
#define IEEE80211_HTCAP_40INTOLERANT 0x4000 /* 40MHz intolerant */
#define IEEE80211_HTCAP_LSIGTXOPPROT 0x8000 /* L-SIG TXOP prot */
+#define IEEE80211_HTCAP_BITS \
+ "\20\1LDPC\2CHWIDTH40\5GREENFIELD\6SHORTGI20\7SHORTGI40\10TXSTBC" \
+ "\13DELBA\14AMSDU(7935)\15DSSSCCK40\16PSMP\1740INTOLERANT" \
+ "\20LSIGTXOPPROT"
+
/* HT parameters (hc_param) */
#define IEEE80211_HTCAP_MAXRXAMPDU 0x03 /* max rx A-MPDU factor */
#define IEEE80211_HTCAP_MAXRXAMPDU_S 0
@@ -754,6 +764,9 @@ struct ieee80211_ath_ie {
#define IEEE80211_ERP_USE_PROTECTION 0x02
#define IEEE80211_ERP_LONG_PREAMBLE 0x04
+#define IEEE80211_ERP_BITS \
+ "\20\1NON_ERP_PRESENT\2USE_PROTECTION\3LONG_PREAMBLE"
+
#define ATH_OUI 0x7f0300 /* Atheros OUI */
#define ATH_OUI_TYPE 0x01
#define ATH_OUI_SUBTYPE 0x01
Modified: user/sam/wifi/sys/net80211/ieee80211_crypto.h
==============================================================================
--- user/sam/wifi/sys/net80211/ieee80211_crypto.h Tue Jan 27 01:45:43 2009 (r187758)
+++ user/sam/wifi/sys/net80211/ieee80211_crypto.h Tue Jan 27 02:09:52 2009 (r187759)
@@ -131,6 +131,9 @@ struct ieee80211_key {
#define IEEE80211_CRYPTO_TKIPMIC (1<<IEEE80211_CIPHER_TKIPMIC)
#define IEEE80211_CRYPTO_CKIP (1<<IEEE80211_CIPHER_CKIP)
+#define IEEE80211_CRYPTO_BITS \
+ "\20\1WEP\2TKIP\3AES\4AES_CCM\5TKIPMIC\6CKIP"
+
#if defined(__KERNEL__) || defined(_KERNEL)
struct ieee80211com;
Modified: user/sam/wifi/sys/net80211/ieee80211_ddb.c
==============================================================================
--- user/sam/wifi/sys/net80211/ieee80211_ddb.c Tue Jan 27 01:45:43 2009 (r187758)
+++ user/sam/wifi/sys/net80211/ieee80211_ddb.c Tue Jan 27 02:09:52 2009 (r187759)
@@ -51,66 +51,6 @@ __FBSDID("$FreeBSD$");
#include <ddb/ddb.h>
#include <ddb/db_sym.h>
-#define IEEE80211_MSG_BITS \
- "\20\3IOCTL\4WDS\5ACTION\6RATECTL\7ROAM\10INACT\11DOTH\12SUPERG" \
- "\13WME\14ACL\15WPA\16RADKEYS\17RADDUMP\20RADIUS\21DOT1X\22POWER" \
- "\23STATE\24OUTPUT\25SCAN\26AUTH\27ASSOC\30NODE\31ELEMID\32XRATE" \
- "\33INPUT\34CRYPTO\35DUPMPKTS\36DEBUG\3711N"
-
-#define IEEE80211_F_BITS \
- "\20\1TURBOP\2COMP\3FF\4BURST\5PRIVACY\6PUREG\10SCAN\11ASCAN\12SIBSS" \
- "\13SHSLOT\14PMGTON\15DESBSSID\16WME\17BGSCAN\20SWRETRY\21TXPOW_FIXED" \
- "\22IBSSON\23SHPREAMBLE\24DATAPAD\25USEPROT\26USERBARKER\27CSAPENDING" \
- "\30WPA1\31WPA2\32DROPUNENC\33COUNTERM\34HIDESSID\35NOBRIDG\36PCF" \
- "\37DOTH\40DWDS"
-
-#define IEEE80211_FEXT_BITS \
- "\20\1NONHT_PR\2INACT\3SCANWAIT\4BGSCAN\5WPS\6TSN\7SCANREQ\10RESUME" \
- "\12NONEPR_PR\13SWBMISS\14DFS\15DOTD\22WDSLEGACY\23PROBECHAN\24HT" \
- "\25AMDPU_TX\26AMPDU_TX\27AMSDU_TX\30AMSDU_RX\31USEHT40\32PUREN" \
- "\33SHORTGI20\34SHORTGI40\35HTCOMPAT\36RIFS"
-
-#define IEEE80211_FVEN_BITS "\20"
-
-#define IEEE80211_C_BITS \
- "\20\1STA\7FF\10TURBOP\11IBSS\12PMGT" \
- "\13HOSTAP\14AHDEMO\15SWRETRY\16TXPMGT\17SHSLOT\20SHPREAMBLE" \
- "\21MONITOR\22DFS\30WPA1\31WPA2\32BURST\33WME\34WDS\36BGSCAN" \
- "\37TXFRAG\40TDMA"
-
-#define IEEE80211_C_CRYPTO_BITS \
- "\20\1WEP\2TKIP\3AES\4AES_CCM\5TKIPMIC\6CKIP\12PMGT"
-
-#define IEEE80211_C_HTCAP_BITS \
- "\20\1LDPC\2CHWIDTH40\5GREENFIELD\6SHORTGI20\7SHORTGI40\10TXSTBC" \
- "\21AMPDU\22AMSDU\23HT\24SMPS\25RIFS"
-
-/* NB: policy bits not included */
-#define IEEE80211_CHAN_BITS \
- "\20\5TURBO\6CCK\7OFDM\0102GHZ\0115GHZ\12PASSIVE\13DYN\14GFSK" \
- "\15STURBO\16HALF\17QUARTER\20HT20\21HT40U\22HT40D\23DFS"
-
-#define IEEE80211_NODE_BITS \
- "\20\1AUTH\2QOS\3ERP\5PWR_MGT\6AREF\7HT\10HTCOMPAT\11WPS\12TSN" \
- "\13AMPDU_RX\14AMPDU_TX\15MIMO_PS\16MIMO_RTS\17RIFS\20SGI20\21SGI40" \
- "\22ASSOCID"
-
-#define IEEE80211_ERP_BITS \
- "\20\1NON_ERP_PRESENT\2USE_PROTECTION\3LONG_PREAMBLE"
-
-#define IEEE80211_CAPINFO_BITS \
- "\20\1ESS\2IBSS\3CF_POLLABLE\4CF_POLLREQ\5PRIVACY\6SHORT_PREAMBLE" \
- "\7PBCC\10CHNL_AGILITY\11SPECTRUM_MGMT\13SHORT_SLOTTIME\14RSN" \
- "\16DSSOFDM"
-
-#define IEEE80211_HTCAP_BITS \
- "\20\1LDPC\2CHWIDTH40\5GREENFIELD\6SHORTGI20\7SHORTGI40\10TXSTBC" \
- "\13DELBA\14AMSDU(7935)\15DSSSCCK40\16PSMP\1740INTOLERANT" \
- "\20LSIGTXOPPROT"
-
-#define IEEE80211_AGGR_BITS \
- "\20\1IMMEDIATE\2XCHGPEND\3RUNNING\4SETUP\5NAK"
-
#define DB_PRINTSYM(prefix, addr) \
db_printf(prefix " "); \
db_printsym((db_addr_t) addr, DB_STGY_ANY); \
@@ -501,7 +441,7 @@ _db_show_com(const struct ieee80211com *
db_printf("\tflags_ven=%b\n", ic->ic_flags_ven, IEEE80211_FVEN_BITS);
db_printf("\tcaps=%b\n", ic->ic_caps, IEEE80211_C_BITS);
db_printf("\tcryptocaps=%b\n",
- ic->ic_cryptocaps, IEEE80211_C_CRYPTO_BITS);
+ ic->ic_cryptocaps, IEEE80211_CRYPTO_BITS);
db_printf("\thtcaps=%b\n", ic->ic_htcaps, IEEE80211_HTCAP_BITS);
#if 0
Modified: user/sam/wifi/sys/net80211/ieee80211_ht.h
==============================================================================
--- user/sam/wifi/sys/net80211/ieee80211_ht.h Tue Jan 27 01:45:43 2009 (r187758)
+++ user/sam/wifi/sys/net80211/ieee80211_ht.h Tue Jan 27 02:09:52 2009 (r187759)
@@ -71,6 +71,9 @@ struct ieee80211_tx_ampdu {
(((tap)->txa_flags & \
(IEEE80211_AGGR_RUNNING|IEEE80211_AGGR_XCHGPEND|IEEE80211_AGGR_NAK)) != 0)
+#define IEEE80211_AGGR_BITS \
+ "\20\1IMMEDIATE\2XCHGPEND\3RUNNING\4SETUP\5NAK"
+
/*
* Traffic estimator support. We estimate packets/sec for
* each AC that is setup for AMPDU or will potentially be
Modified: user/sam/wifi/sys/net80211/ieee80211_node.h
==============================================================================
--- user/sam/wifi/sys/net80211/ieee80211_node.h Tue Jan 27 01:45:43 2009 (r187758)
+++ user/sam/wifi/sys/net80211/ieee80211_node.h Tue Jan 27 02:09:52 2009 (r187759)
@@ -206,6 +206,11 @@ MALLOC_DECLARE(M_80211_NODE_IE);
IEEE80211_NODE_MIMO_RTS | IEEE80211_NODE_RIFS | \
IEEE80211_NODE_SGI20 | IEEE80211_NODE_SGI40)
+#define IEEE80211_NODE_BITS \
+ "\20\1AUTH\2QOS\3ERP\5PWR_MGT\6AREF\7HT\10HTCOMPAT\11WPS\12TSN" \
+ "\13AMPDU_RX\14AMPDU_TX\15MIMO_PS\16MIMO_RTS\17RIFS\20SGI20\21SGI40" \
+ "\22ASSOCID"
+
#define IEEE80211_NODE_AID(ni) IEEE80211_AID(ni->ni_associd)
#define IEEE80211_NODE_STAT(ni,stat) (ni->ni_stats.ns_##stat++)
Modified: user/sam/wifi/sys/net80211/ieee80211_var.h
==============================================================================
--- user/sam/wifi/sys/net80211/ieee80211_var.h Tue Jan 27 01:45:43 2009 (r187758)
+++ user/sam/wifi/sys/net80211/ieee80211_var.h Tue Jan 27 02:09:52 2009 (r187759)
@@ -469,6 +469,13 @@ MALLOC_DECLARE(M_80211_VAP);
#define IEEE80211_F_DOTH 0x40000000 /* CONF: 11h enabled */
#define IEEE80211_F_DWDS 0x80000000 /* CONF: Dynamic WDS enabled */
+#define IEEE80211_F_BITS \
+ "\20\1TURBOP\2COMP\3FF\4BURST\5PRIVACY\6PUREG\10SCAN\11ASCAN\12SIBSS" \
+ "\13SHSLOT\14PMGTON\15DESBSSID\16WME\17BGSCAN\20SWRETRY\21TXPOW_FIXED" \
+ "\22IBSSON\23SHPREAMBLE\24DATAPAD\25USEPROT\26USERBARKER\27CSAPENDING" \
+ "\30WPA1\31WPA2\32DROPUNENC\33COUNTERM\34HIDESSID\35NOBRIDG\36PCF" \
+ "\37DOTH\40DWDS"
+
/* Atheros protocol-specific flags */
#define IEEE80211_F_ATHEROS \
(IEEE80211_F_FF | IEEE80211_F_COMP | IEEE80211_F_TURBOP)
@@ -505,6 +512,14 @@ MALLOC_DECLARE(M_80211_VAP);
#define IEEE80211_FEXT_HTCOMPAT 0x10000000 /* CONF: HT vendor OUI's */
#define IEEE80211_FEXT_RIFS 0x20000000 /* CONF: RIFS enabled */
+#define IEEE80211_FEXT_BITS \
+ "\20\1NONHT_PR\2INACT\3SCANWAIT\4BGSCAN\5WPS\6TSN\7SCANREQ\10RESUME" \
+ "\12NONEPR_PR\13SWBMISS\14DFS\15DOTD\22WDSLEGACY\23PROBECHAN\24HT" \
+ "\25AMDPU_TX\26AMPDU_TX\27AMSDU_TX\30AMSDU_RX\31USEHT40\32PUREN" \
+ "\33SHORTGI20\34SHORTGI40\35HTCOMPAT\36RIFS"
+
+#define IEEE80211_FVEN_BITS "\20"
+
/* ic_caps/iv_caps: device driver capabilities */
/* 0x2f available */
#define IEEE80211_C_STA 0x00000001 /* CAPABILITY: STA available */
@@ -538,6 +553,12 @@ MALLOC_DECLARE(M_80211_VAP);
IEEE80211_C_AHDEMO | IEEE80211_C_MONITOR | IEEE80211_C_WDS | \
IEEE80211_C_TDMA)
+#define IEEE80211_C_BITS \
+ "\20\1STA\7FF\10TURBOP\11IBSS\12PMGT" \
+ "\13HOSTAP\14AHDEMO\15SWRETRY\16TXPMGT\17SHSLOT\20SHPREAMBLE" \
+ "\21MONITOR\22DFS\30WPA1\31WPA2\32BURST\33WME\34WDS\36BGSCAN" \
+ "\37TXFRAG\40TDMA"
+
/*
* ic_htcaps/iv_htcaps: HT-specific device/driver capabilities
*
@@ -551,6 +572,10 @@ MALLOC_DECLARE(M_80211_VAP);
#define IEEE80211_HTC_SMPS 0x00080000 /* CAPABILITY: MIMO power save*/
#define IEEE80211_HTC_RIFS 0x00100000 /* CAPABILITY: RIFS support */
+#define IEEE80211_C_HTCAP_BITS \
+ "\20\1LDPC\2CHWIDTH40\5GREENFIELD\6SHORTGI20\7SHORTGI40\10TXSTBC" \
+ "\21AMPDU\22AMSDU\23HT\24SMPS\25RIFS"
+
void ieee80211_ifattach(struct ieee80211com *);
void ieee80211_ifdetach(struct ieee80211com *);
int ieee80211_vap_setup(struct ieee80211com *, struct ieee80211vap *,
@@ -694,6 +719,12 @@ ieee80211_htchanflags(const struct ieee8
#define IEEE80211_MSG_ANY 0xffffffff /* anything */
+#define IEEE80211_MSG_BITS \
+ "\20\3IOCTL\4WDS\5ACTION\6RATECTL\7ROAM\10INACT\11DOTH\12SUPERG" \
+ "\13WME\14ACL\15WPA\16RADKEYS\17RADDUMP\20RADIUS\21DOT1X\22POWER" \
+ "\23STATE\24OUTPUT\25SCAN\26AUTH\27ASSOC\30NODE\31ELEMID\32XRATE" \
+ "\33INPUT\34CRYPTO\35DUPMPKTS\36DEBUG\3711N"
+
#ifdef IEEE80211_DEBUG
#define ieee80211_msg(_vap, _m) ((_vap)->iv_debug & (_m))
#define IEEE80211_DPRINTF(_vap, _m, _fmt, ...) do { \
More information about the svn-src-user
mailing list