diff options
| author | adrian <adrian@FreeBSD.org> | 2011-04-22 00:44:27 +0000 |
|---|---|---|
| committer | adrian <adrian@FreeBSD.org> | 2011-04-22 00:44:27 +0000 |
| commit | f0e5a695e9eedf13d440df2d5f8a3218f3a0c9d3 (patch) | |
| tree | aa409ca85ae0750514cf2fcf1f11820501938d84 /sys/net80211/ieee80211_node.c | |
| parent | 0f13b0e3bfeafa2d83b5c05c2ff47acb45d02a8b (diff) | |
| download | FreeBSD-src-f0e5a695e9eedf13d440df2d5f8a3218f3a0c9d3.zip FreeBSD-src-f0e5a695e9eedf13d440df2d5f8a3218f3a0c9d3.tar.gz | |
Revert r220907 and r220915.
Changing the size of struct ieee80211_mimo_info changes
the STA info data, breaking ifconfig in general.
Diffstat (limited to 'sys/net80211/ieee80211_node.c')
| -rw-r--r-- | sys/net80211/ieee80211_node.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index 2b29feb..71f97f0 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -1091,31 +1091,19 @@ 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_ctl[i] = 0; + info->rssi[i] = 0; } else { rssi = IEEE80211_RSSI_GET(avgrssi); - info->rssi_ctl[i] = rssi < 0 ? 0 : rssi > 127 ? 127 : rssi; + info->rssi[i] = rssi < 0 ? 0 : rssi > 127 ? 127 : rssi; } - info->noise_ctl[i] = ni->ni_mimo_noise_ctl[i]; - - /* 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]; + info->noise[i] = ni->ni_mimo_noise_ctl[i]; } + /* XXX ext radios? */ + /* XXX EVM? */ } |
