Author: adrian
Date: Fri Apr 22 00:44:27 2011
New Revision: 220935
URL: http://svn.freebsd.org/changeset/base/220935
Log:
Revert r220907 and r220915.
Changing the size of struct ieee80211_mimo_info changes
the STA info data, breaking ifconfig in general.
Modified:
head/sbin/ifconfig/ifieee80211.c
head/sys/dev/mwl/if_mwl.c
head/sys/net80211/_ieee80211.h
head/sys/net80211/ieee80211_node.c
Modified: head/sbin/ifconfig/ifieee80211.c
==============================================================================
--- head/sbin/ifconfig/ifieee80211.c Fri Apr 22 00:32:16 2011
(r220934)
+++ head/sbin/ifconfig/ifieee80211.c Fri Apr 22 00:44:27 2011
(r220935)
@@ -3139,13 +3139,11 @@ static void
printmimo(const struct ieee80211_mimo_info *mi)
{
/* NB: don't muddy display unless there's something to show */
- /* XXX should check flags and n_rx_chains */
- if (mi->rssi_ctl[0] != 0 || mi->rssi_ctl[1] != 0 || mi->rssi_ctl[2] !=
0) {
+ if (mi->rssi[0] != 0 || mi->rssi[1] != 0 || mi->rssi[2] != 0) {
/* XXX ignore EVM for now */
- /* XXX ignore EXT for now */
printf(" (rssi %d:%d:%d nf %d:%d:%d)",
- mi->rssi_ctl[0], mi->rssi_ctl[1], mi->rssi_ctl[2],
- mi->noise_ctl[0], mi->noise_ctl[1], mi->noise_ctl[2]);
+ mi->rssi[0], mi->rssi[1], mi->rssi[2],
+ mi->noise[0], mi->noise[1], mi->noise[2]);
}
}
Modified: head/sys/dev/mwl/if_mwl.c
==============================================================================
--- head/sys/dev/mwl/if_mwl.c Fri Apr 22 00:32:16 2011 (r220934)
+++ head/sys/dev/mwl/if_mwl.c Fri Apr 22 00:44:27 2011 (r220935)
@@ -2527,13 +2527,13 @@ mwl_node_getmimoinfo(const struct ieee80
if (mn->mn_ai.rssi_c > rssi_max)
rssi_max = mn->mn_ai.rssi_c;
- CVT(mi->rssi_ctl[0], mn->mn_ai.rssi_a);
- CVT(mi->rssi_ctl[1], mn->mn_ai.rssi_b);
- CVT(mi->rssi_ctl[2], mn->mn_ai.rssi_c);
-
- mi->noise_ctl[0] = mn->mn_ai.nf_a;
- mi->noise_ctl[1] = mn->mn_ai.nf_b;
- mi->noise_ctl[2] = mn->mn_ai.nf_c;
+ CVT(mi->rssi[0], mn->mn_ai.rssi_a);
+ CVT(mi->rssi[1], mn->mn_ai.rssi_b);
+ CVT(mi->rssi[2], mn->mn_ai.rssi_c);
+
+ mi->noise[0] = mn->mn_ai.nf_a;
+ mi->noise[1] = mn->mn_ai.nf_b;
+ mi->noise[2] = mn->mn_ai.nf_c;
#undef CVT
}
Modified: head/sys/net80211/_ieee80211.h
==============================================================================
--- head/sys/net80211/_ieee80211.h Fri Apr 22 00:32:16 2011
(r220934)
+++ head/sys/net80211/_ieee80211.h Fri Apr 22 00:44:27 2011
(r220935)
@@ -395,14 +395,9 @@ struct ieee80211_regdomain {
* XXX This doesn't yet export both ctl/ext chain details
*/
struct ieee80211_mimo_info {
- 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 */
+ 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 */
};
#endif /* _NET80211__IEEE80211_H_ */
Modified: head/sys/net80211/ieee80211_node.c
==============================================================================
--- head/sys/net80211/ieee80211_node.c Fri Apr 22 00:32:16 2011
(r220934)
+++ head/sys/net80211/ieee80211_node.c Fri Apr 22 00:44:27 2011
(r220935)
@@ -1091,31 +1091,19 @@ node_getmimoinfo(const struct ieee80211_
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? */
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
