From owner-svn-src-head@FreeBSD.ORG Fri Apr 22 00:44:28 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 55F2B106564A; Fri, 22 Apr 2011 00:44:28 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 426398FC0A; Fri, 22 Apr 2011 00:44:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p3M0iSK4019450; Fri, 22 Apr 2011 00:44:28 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3M0iS1q019445; Fri, 22 Apr 2011 00:44:28 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201104220044.p3M0iS1q019445@svn.freebsd.org> From: Adrian Chadd Date: Fri, 22 Apr 2011 00:44:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r220935 - in head: sbin/ifconfig sys/dev/mwl sys/net80211 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Apr 2011 00:44:28 -0000 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? */ }