From owner-svn-src-all@freebsd.org Wed Dec 7 04:03:53 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1435DC67F85; Wed, 7 Dec 2016 04:03:53 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D6AB31B92; Wed, 7 Dec 2016 04:03:52 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB743q9f047788; Wed, 7 Dec 2016 04:03:52 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB743q8d047787; Wed, 7 Dec 2016 04:03:52 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201612070403.uB743q8d047787@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Wed, 7 Dec 2016 04:03:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r309665 - head/sys/net80211 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 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: Wed, 07 Dec 2016 04:03:53 -0000 Author: adrian Date: Wed Dec 7 04:03:51 2016 New Revision: 309665 URL: https://svnweb.freebsd.org/changeset/base/309665 Log: [net80211] flesh out more RX phy information. I'm teaching my ath10k port to communicate up the per-rate / channel width information I get from the firmware. The HT40 flag field should just be retired and instead moved to use the PHY bandwidth field. Modified: head/sys/net80211/ieee80211_freebsd.h Modified: head/sys/net80211/ieee80211_freebsd.h ============================================================================== --- head/sys/net80211/ieee80211_freebsd.h Wed Dec 7 04:02:41 2016 (r309664) +++ head/sys/net80211/ieee80211_freebsd.h Wed Dec 7 04:03:51 2016 (r309665) @@ -658,6 +658,10 @@ int ieee80211_get_xmit_params(struct mbu #define IEEE80211_RX_F_IV_STRIP 0x00000200 /* Decrypted; IV stripped */ #define IEEE80211_RX_F_MMIC_STRIP 0x00000400 /* Decrypted; MMIC stripped */ #define IEEE80211_RX_F_SHORTGI 0x00000800 /* This is a short-GI frame */ +#define IEEE80211_RX_F_CCK 0x00001000 +#define IEEE80211_RX_F_OFDM 0x00002000 +#define IEEE80211_RX_F_HT 0x00004000 +#define IEEE80211_RX_F_VHT 0x00008000 /* Channel width */ #define IEEE80211_RX_FW_20MHZ 1 @@ -687,7 +691,7 @@ struct ieee80211_rx_stats { uint8_t c_nf; /* global NF */ uint8_t c_rssi; /* global RSSI */ uint8_t c_chain; /* number of RX chains involved */ - uint8_t c_rate; /* legacy + 11n rate code */ + uint8_t c_rate; /* legacy; 11n rate code; VHT MCS */ /* 32 bits */ uint16_t c_freq; /* Frequency, MHz */ @@ -703,7 +707,8 @@ struct ieee80211_rx_stats { /* 32 bits */ uint8_t c_phytype; /* PHY type, FW flags above */ - uint8_t c_pad2[3]; + uint8_t c_vhtnss; /* VHT - number of spatial streams */ + uint8_t c_pad2[2]; }; struct ieee80211_rx_params {