From owner-svn-src-all@FreeBSD.ORG Thu Apr 21 03:47:41 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 53586106566C; Thu, 21 Apr 2011 03:47:41 +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 429078FC1D; Thu, 21 Apr 2011 03:47:41 +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 p3L3lfGg078669; Thu, 21 Apr 2011 03:47:41 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3L3lfch078665; Thu, 21 Apr 2011 03:47:41 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201104210347.p3L3lfch078665@svn.freebsd.org> From: Adrian Chadd Date: Thu, 21 Apr 2011 03:47:41 +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: r220907 - in head: sbin/ifconfig sys/net80211 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Apr 2011 03:47:41 -0000 Author: adrian Date: Thu Apr 21 03:47:40 2011 New Revision: 220907 URL: http://svn.freebsd.org/changeset/base/220907 Log: 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. Modified: head/sbin/ifconfig/ifieee80211.c head/sys/net80211/_ieee80211.h head/sys/net80211/ieee80211_node.c Modified: head/sbin/ifconfig/ifieee80211.c ============================================================================== --- head/sbin/ifconfig/ifieee80211.c Wed Apr 20 23:25:18 2011 (r220906) +++ head/sbin/ifconfig/ifieee80211.c Thu Apr 21 03:47:40 2011 (r220907) @@ -3139,11 +3139,13 @@ static void printmimo(const struct ieee80211_mimo_info *mi) { /* NB: don't muddy display unless there's something to show */ - if (mi->rssi[0] != 0 || mi->rssi[1] != 0 || mi->rssi[2] != 0) { + /* XXX should check flags and n_rx_chains */ + if (mi->rssi_ctl[0] != 0 || mi->rssi_ctl[1] != 0 || mi->rssi_ctl[2] != 0) { /* XXX ignore EVM for now */ + /* XXX ignore EXT for now */ printf(" (rssi %d:%d:%d nf %d:%d:%d)", - mi->rssi[0], mi->rssi[1], mi->rssi[2], - mi->noise[0], mi->noise[1], mi->noise[2]); + mi->rssi_ctl[0], mi->rssi_ctl[1], mi->rssi_ctl[2], + mi->noise_ctl[0], mi->noise_ctl[1], mi->noise_ctl[2]); } } Modified: head/sys/net80211/_ieee80211.h ============================================================================== --- head/sys/net80211/_ieee80211.h Wed Apr 20 23:25:18 2011 (r220906) +++ head/sys/net80211/_ieee80211.h Thu Apr 21 03:47:40 2011 (r220907) @@ -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_ */ Modified: head/sys/net80211/ieee80211_node.c ============================================================================== --- head/sys/net80211/ieee80211_node.c Wed Apr 20 23:25:18 2011 (r220906) +++ head/sys/net80211/ieee80211_node.c Thu Apr 21 03:47:40 2011 (r220907) @@ -1091,18 +1091,30 @@ 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[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? */ }