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/ieee80211_node.c | |
| 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/ieee80211_node.c')
| -rw-r--r-- | sys/net80211/ieee80211_node.c | 22 |
1 files changed, 17 insertions, 5 deletions
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? */ } |
