cfg80211/mac80211/ath10k: Extend avg ack rssi support for mgmt frames
v2 cover cfg80211/mac80211/ath10k: Extend avg ack rssi support for mgmt frames
Adding ack signal support in station dump if the driver supports; also made changes to update "last ack signal" and "avg ack signal" for both data and management tx ack packet.
Balaji Pothunoori (3):
cfg80211: Extend avg ack rssi support for mgmt frames
mac80211: Extend avg ack rssi support for mgmt frames
ath10k: management tx ack rssi capability check
drivers/net/wireless/ath/ath10k/mac.c | 5 +++-- include/uapi/linux/nl80211.h | 7 +++++++ net/mac80211/sta_info.c | 26 +++++++++++++------------- net/wireless/nl80211.c | 7 ++++--- 4 files changed, 27 insertions(+), 18 deletions(-)
--
v2 : Addressed Johannes comments
Modified subject and commit log
2.7.4
_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k
PATCH v2 1/3 cfg80211: Extend avg ack rssi support for mgmt frames
Defining APIs to update avg ack rssi irrespective of data or mgmt tx ack packet; this patch keeps the original behavior intact without breaking the existing API.
---
v2: Addressed Johannes comments
Modified subject and commit log
include/uapi/linux/nl80211.h | 7 +++++++ net/wireless/nl80211.c | 7 ++++--- 2 files changed, 11 insertions(+), 3 deletions(-)
include/uapi/linux/nl80211.h +7 -0
@@ -52,6 +52,13 @@#define NL80211_MULTICAST_GROUP_NAN "nan"#define NL80211_MULTICAST_GROUP_TESTMODE "testmode" +/* +* These APIs are defined to maintain average ack signal for both data and +* mgmt tx ack packets +*/ +#define NL80211_STA_INFO_ACK_SIGNAL_AVG NL80211_STA_INFO_DATA_ACK_SIGNAL_AVG +#define NL80211_EXT_FEATURE_ACK_SIGNAL_SUPPORT NL80211_EXT_FEATURE_DATA_ACK_SIGNAL_SUPPORT +/** * DOC: Station handling *
net/wireless/nl80211.c +4 -3
@@ -4723,10 +4723,11 @@ static int nl80211_send_station(struct sk_buff *msg, u32 cmd, u32 portid,PUT_SINFO_U64 (RX_DROP_MISC , rx_dropped_misc);PUT_SINFO_U64 (BEACON_RX , rx_beacon);PUT_SINFO (BEACON_SIGNAL_AVG , rx_beacon_signal_avg, u8); -PUT_SINFO (ACK_SIGNAL , ack_signal, u8);if (wiphy_ext_feature_isset (&rdev->wiphy, -NL80211_EXT_FEATURE_DATA_ACK_SIGNAL_SUPPORT )) -PUT_SINFO (DATA_ACK_SIGNAL_AVG , avg_ack_signal, s8); +NL80211_EXT_FEATURE_ACK_SIGNAL_SUPPORT )) { +PUT_SINFO (ACK_SIGNAL , ack_signal, u8); +PUT_SINFO (ACK_SIGNAL_AVG , avg_ack_signal, s8); + }#undef PUT_SINFO#undef PUT_SINFO_U64
Signature · 7 lines
2.7.4 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
PATCH v2 2/3 mac80211: Extend avg ack rssi support for mgmt frames
In reply to Balaji PothunooriUsed defined API to make common average ack rssi support irrespective of data or mamagement tx ack packet.
---
v2: Addressed Johannes comments
Modified subject and commit log
net/mac80211/sta_info.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
net/mac80211/sta_info.c +13 -13
@@ -2317,19 +2317,19 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo, sinfo->expected_throughput = thr; } -if (!(sinfo->filled &BIT_ULL (NL80211_STA_INFO_ACK_SIGNAL )) && - sta->status_stats.ack_signal_filled) { - sinfo->ack_signal = sta->status_stats.last_ack_signal; - sinfo->filled |=BIT_ULL (NL80211_STA_INFO_ACK_SIGNAL ); - } - -if (ieee80211_hw_check (&sta->local->hw,REPORTS_TX_ACK_STATUS ) && - !(sinfo->filled &BIT_ULL (NL80211_STA_INFO_DATA_ACK_SIGNAL_AVG ))) { - sinfo->avg_ack_signal = - -(s8 )ewma_avg_signal_read ( - &sta->status_stats.avg_ack_signal); - sinfo->filled |= -BIT_ULL (NL80211_STA_INFO_DATA_ACK_SIGNAL_AVG ); +if (ieee80211_hw_check (&sta->local->hw,REPORTS_TX_ACK_STATUS )) { +if (sta->status_stats.ack_signal_filled && + (!(sinfo->filled &BIT_ULL (NL80211_STA_INFO_ACK_SIGNAL )) || + !(sinfo->filled &BIT_ULL (NL80211_STA_INFO_ACK_SIGNAL_AVG )))) { + sinfo->ack_signal = + sta->status_stats.last_ack_signal; + sinfo->filled |= +BIT_ULL (NL80211_STA_INFO_ACK_SIGNAL ); + sinfo->avg_ack_signal = + -(s8 )ewma_avg_signal_read (&sta->status_stats.avg_ack_signal); + sinfo->filled |= +BIT_ULL (NL80211_STA_INFO_ACK_SIGNAL_AVG ); + } } }
Signature · 7 lines
2.7.4 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
PATCH v2 3/3 ath10k: management tx ack rssi capability check
In reply to Balaji PothunooriAdding WMI service check for management tx ack rssi support; this is done to maintain common avg ack signal in user level for both data and management tx ack packet.
Tested on QCA4019(fw version-10.4-3.2.1-00063).
---
Note: This patch depends on following patch
https://patchwork.kernel.org/patch/10343153/
drivers/net/wireless/ath/ath10k/mac.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath10k/mac.c +3 -2
@@ -8410,9 +8410,10 @@ int ath10k_mac_register(struct ath10k *ar)wiphy_ext_feature_set (ar->hw->wiphy,NL80211_EXT_FEATURE_SET_SCAN_DWELL ); -if (test_bit (WMI_SERVICE_TX_DATA_ACK_RSSI , ar->wmi.svc_map)) +if (test_bit (WMI_SERVICE_TX_DATA_ACK_RSSI , ar->wmi.svc_map) || +test_bit (WMI_SERVICE_HTT_MGMT_TX_COMP_VALID_FLAGS , ar->wmi.svc_map))wiphy_ext_feature_set (ar->hw->wiphy, -NL80211_EXT_FEATURE_DATA_ACK_SIGNAL_SUPPORT ); +NL80211_EXT_FEATURE_DATA_ACK_SIGNAL_SUPPORT );/* * on LL hardware queues are managed entirely by the FW
Signature · 7 lines
2.7.4 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Johannes Berg
maintainerRe: [PATCH v2 3/3] ath10k: management tx ack rssi capability check
drivers/net/wireless/ath/ath10k/mac.c int ath10k_mac_register(struct ath10k *ar) · line 8416
Quoted 8 lines · Balaji Pothunoori
drivers/net/wireless/ath/ath10k/mac.c +3
-2-if (test_bit (WMI_SERVICE_TX_DATA_ACK_RSSI , ar->wmi.svc_map)) +if (test_bit (WMI_SERVICE_TX_DATA_ACK_RSSI , ar->wmi.svc_map) || +test_bit (WMI_SERVICE_HTT_MGMT_TX_COMP_VALID_FLAGS , ar->wmi.svc_map))wiphy_ext_feature_set (ar->hw->wiphy, -NL80211_EXT_FEATURE_DATA_ACK_SIGNAL_SUPPORT ); +NL80211_EXT_FEATURE_DATA_ACK_SIGNAL_SUPPORT );
You should use the new name, and fix indentation.
johannes
_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k
Re: [PATCH v2 3/3] ath10k: management tx ack rssi capability check
Quoted 13 lines · Johannes Berg
drivers/net/wireless/ath/ath10k/mac.c int ath10k_mac_register(struct ath10k *ar) · line 8416
Quoted 9 lines · Balaji Pothunoori
drivers/net/wireless/ath/ath10k/mac.c +2
-1-if (test_bit (WMI_SERVICE_TX_DATA_ACK_RSSI , ar->wmi.svc_map)) +if (test_bit (WMI_SERVICE_TX_DATA_ACK_RSSI , ar->wmi.svc_map) || + test_bit(WMI_SERVICE_HTT_MGMT_TX_COMP_VALID_FLAGS,
ar->wmi.svc_map))drivers/net/wireless/ath/ath10k/mac.c +1
-1wiphy_ext_feature_set (ar->hw->wiphy, -NL80211_EXT_FEATURE_DATA_ACK_SIGNAL_SUPPORT ); +NL80211_EXT_FEATURE_DATA_ACK_SIGNAL_SUPPORT );You should use the new name, and fix indentation.
Quoted 1 line
johannes
Sure, i will send updated v3 patch.
_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k
Johannes Berg
maintainerI've sort of applied patches 1/2 squashed together, but with some changes.
I hope those are OK - otherwise send me another patch on top please.
johannes
_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k