diff options
| author | adrian <adrian@FreeBSD.org> | 2011-04-21 03:47:40 +0000 |
|---|---|---|
| committer | adrian <adrian@FreeBSD.org> | 2011-04-21 03:47:40 +0000 |
| commit | 81acf7034799a150d418e6daf4ff2e5f09c6a734 (patch) | |
| tree | 212e612c3151231179d4634c6d720082cc88d172 /sys/net80211 | |
| parent | 2d3aacf51384f95cdf3062b3eebbe41a8a97aaa7 (diff) | |
| download | FreeBSD-src-81acf7034799a150d418e6daf4ff2e5f09c6a734.zip FreeBSD-src-81acf7034799a150d418e6daf4ff2e5f09c6a734.tar.gz | |
Change the MIMO userland export ABI to include flags, number of radio chains,
extended EVM statistics and EXT channel data.
ifconfig still displays 3 chains worth of ctl noise/rssi.
Diffstat (limited to 'sys/net80211')
| -rw-r--r-- | sys/net80211/_ieee80211.h | 13 | ||||
| -rw-r--r-- | sys/net80211/ieee80211_node.c | 22 |
2 files changed, 26 insertions, 9 deletions
diff --git a/sys/net80211/_ieee80211.h b/sys/net80211/_ieee80211.h index 3793c66..e9808a9 100644 --- a/sys/net80211/_ieee80211.h +++ b/sys/net80211/_ieee80211.h @@ -395,9 +395,14 @@ struct ieee80211_regdomain { * XXX This doesn't yet export both ctl/ext chain details */ struct ieee80211_mimo_info { - int8_t rssi[IEEE80211_MAX_CHAINS]; /* per-antenna rssi */ - int8_t noise[IEEE80211_MAX_CHAINS]; /* per-antenna noise floor */ - uint8_t pad[2]; - uint32_t evm[3]; /* EVM data */ + uint16_t flags; /* IEEE80211_R_* flags */ + uint8_t n_rx_chains; /* number of RX chains involved */ + uint8_t pad[1]; + int8_t rssi_ctl[IEEE80211_MAX_CHAINS]; /* per-antenna rssi */ + int8_t noise_ctl[IEEE80211_MAX_CHAINS]; /* per-antenna noise floor */ + int8_t rssi_ext[IEEE80211_MAX_CHAINS]; /* per-antenna ext rssi */ + int8_t noise_ext[IEEE80211_MAX_CHAINS]; /* per-antenna ext noise floor */ + uint32_t evm[IEEE80211_MAX_CHAINS][IEEE80211_MAX_EVM_PILOTS]; + /* EVM data */ }; #endif /* _NET80211__IEEE80211_H_ */ diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index 71f97f0..2b29feb 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -1091,18 +1091,30 @@ node_getmimoinfo(const struct ieee80211_node *ni, bzero(info, sizeof(*info)); + /* XXX set flags - evm, ctl/ext data, etc. */ + info->n_rx_chains = ni->ni_mimo_chains; + for (i = 0; i < ni->ni_mimo_chains; i++) { + /* Ctl channel */ avgrssi = ni->ni_mimo_rssi_ctl[i]; if (avgrssi == IEEE80211_RSSI_DUMMY_MARKER) { - info->rssi[i] = 0; + info->rssi_ctl[i] = 0; } else { rssi = IEEE80211_RSSI_GET(avgrssi); - info->rssi[i] = rssi < 0 ? 0 : rssi > 127 ? 127 : rssi; + info->rssi_ctl[i] = rssi < 0 ? 0 : rssi > 127 ? 127 : rssi; } - info->noise[i] = ni->ni_mimo_noise_ctl[i]; - } + info->noise_ctl[i] = ni->ni_mimo_noise_ctl[i]; - /* XXX ext radios? */ + /* Ext channel */ + avgrssi = ni->ni_mimo_rssi_ext[i]; + if (avgrssi == IEEE80211_RSSI_DUMMY_MARKER) { + info->rssi_ext[i] = 0; + } else { + rssi = IEEE80211_RSSI_GET(avgrssi); + info->rssi_ext[i] = rssi < 0 ? 0 : rssi > 127 ? 127 : rssi; + } + info->noise_ext[i] = ni->ni_mimo_noise_ext[i]; + } /* XXX EVM? */ } |
