ath10k: restore tx sk_buff of htt header for SDIO
PATCH 1/1 ath10k: restore tx sk_buff of htt header for SDIO
ieee80211_report_used_skb of mac80211 use the frame_control of ieee80211_hdr in sk_buff and indicate it to another function ieee80211_mgd_conn_tx_status, then it queue work ieee80211_sta_work, but ieee80211_is_auth(fc) in ieee80211_sta_work check fail when the authentication has transmitted by ath10k.
When the ath10k report it with HTT_TX_COMPL_STATE_DISCARD, it will be set without flag IEEE80211_TX_STAT_ACK, then mac80211 should try the next authentication immeditely, but in fact mac80211 wait 1 second for it, the reason is ieee80211_is_auth(fc) in ieee80211_sta_work check fail for the sk_buff which is not restored, the data of sk_buff is not the begin of ieee80211_hdr, in fact it is the begin of htt_cmd_hdr.
dmesg without this patch, it wait 1 second for the next retry when ath10k report without IEEE80211_TX_STAT_ACK for authentication:
[ 6973.883116] wlan0: send auth to 5e:6f:2b:0d:fb:d7 (try 1/3) [ 6974.705471] wlan0: send auth to 5e:6f:2b:0d:fb:d7 (try 2/3) [ 6975.712962] wlan0: send auth to 5e:6f:2b:0d:fb:d7 (try 3/3)
Restore the sk_buff make mac8011 retry the next authentication immeditely which meet logic of mac80211.
dmesg with this patch, it retry the next immeditely when ath10k report without IEEE80211_TX_STAT_ACK for authentication:
[ 216.734813] wlan0: send auth to 5e:6f:2b:0d:fb:d7 (try 1/3) [ 216.739914] wlan0: send auth to 5e:6f:2b:0d:fb:d7 (try 2/3) [ 216.745874] wlan0: send auth to 5e:6f:2b:0d:fb:d7 (try 3/3)
Tested-on: QCA6174 hw3.2 SDIO WLAN.RMH.4.4.1-00049
--- drivers/net/wireless/ath/ath10k/htt_tx.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/ath/ath10k/htt_tx.c +2 -0
@@ -573,6 +573,8 @@ void ath10k_htt_htc_tx_complete(struct ath10k *ar, struct sk_buff *skb) desc_hdr = (struct htt_data_tx_desc *) (skb->data +sizeof (*htt_hdr)); flags1 =__le16_to_cpu (desc_hdr->flags1); +skb_pull (skb,sizeof (struct htt_cmd_hdr )); +skb_pull (skb,sizeof (struct htt_data_tx_desc )); } }
Signature · 7 lines
2.27.0 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Quoted 24 lines · Wen Gong
ieee80211_report_used_skbof mac80211 use theframe_controlofieee80211_hdrinsk_buffand indicate it to another functionieee80211_mgd_conn_tx_status, then it queue workieee80211_sta_work, butieee80211_is_auth(fc)inieee80211_sta_workcheck fail when the authentication has transmitted by ath10k.When the ath10k report it with
HTT_TX_COMPL_STATE_DISCARD, it will be set without flagIEEE80211_TX_STAT_ACK, then mac80211 should try the next authentication immeditely, but in fact mac80211 wait 1 second for it, the reason isieee80211_is_auth(fc)inieee80211_sta_workcheck fail for thesk_buffwhich is not restored, the data ofsk_buffis not the begin ofieee80211_hdr, in fact it is the begin ofhtt_cmd_hdr.dmesg without this patch, it wait 1 second for the next retry when ath10k report without
IEEE80211_TX_STAT_ACKfor authentication:[ 6973.883116] wlan0: send auth to 5e:6f:2b:0d:fb:d7 (try 1/3) [ 6974.705471] wlan0: send auth to 5e:6f:2b:0d:fb:d7 (try 2/3) [ 6975.712962] wlan0: send auth to 5e:6f:2b:0d:fb:d7 (try 3/3)Restore the
sk_buffmake mac8011 retry the next authentication immeditely which meet logic of mac80211.dmesg with this patch, it retry the next immeditely when ath10k report without
IEEE80211_TX_STAT_ACKfor authentication:
Quoted 8 lines
[ 216.734813] wlan0: send auth to 5e:6f:2b:0d:fb:d7 (try 1/3) [ 216.739914] wlan0: send auth to 5e:6f:2b:0d:fb:d7 (try 2/3) [ 216.745874] wlan0: send auth to 5e:6f:2b:0d:fb:d7 (try 3/3)Tested-on: QCA6174 hw3.2 SDIO WLAN.RMH.4.4.1-00049
Signed-off-by Wen Gong <[email protected]>Signed-off-by Kalle Valo <[email protected]>
Patch applied to ath-next branch of ath.git, thanks.
e6f1c0d26a31 ath10k: restore tx sk_buff of htt header for SDIO
Signature · 9 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Quoted 24 lines · Wen Gong
ieee80211_report_used_skbof mac80211 use theframe_controlofieee80211_hdrinsk_buffand indicate it to another functionieee80211_mgd_conn_tx_status, then it queue workieee80211_sta_work, butieee80211_is_auth(fc)inieee80211_sta_workcheck fail when the authentication has transmitted by ath10k.When the ath10k report it with
HTT_TX_COMPL_STATE_DISCARD, it will be set without flagIEEE80211_TX_STAT_ACK, then mac80211 should try the next authentication immeditely, but in fact mac80211 wait 1 second for it, the reason isieee80211_is_auth(fc)inieee80211_sta_workcheck fail for thesk_buffwhich is not restored, the data ofsk_buffis not the begin ofieee80211_hdr, in fact it is the begin ofhtt_cmd_hdr.dmesg without this patch, it wait 1 second for the next retry when ath10k report without
IEEE80211_TX_STAT_ACKfor authentication:[ 6973.883116] wlan0: send auth to 5e:6f:2b:0d:fb:d7 (try 1/3) [ 6974.705471] wlan0: send auth to 5e:6f:2b:0d:fb:d7 (try 2/3) [ 6975.712962] wlan0: send auth to 5e:6f:2b:0d:fb:d7 (try 3/3)Restore the
sk_buffmake mac8011 retry the next authentication immeditely which meet logic of mac80211.dmesg with this patch, it retry the next immeditely when ath10k report without
IEEE80211_TX_STAT_ACKfor authentication:
Quoted 8 lines
[ 216.734813] wlan0: send auth to 5e:6f:2b:0d:fb:d7 (try 1/3) [ 216.739914] wlan0: send auth to 5e:6f:2b:0d:fb:d7 (try 2/3) [ 216.745874] wlan0: send auth to 5e:6f:2b:0d:fb:d7 (try 3/3)Tested-on: QCA6174 hw3.2 SDIO WLAN.RMH.4.4.1-00049
Signed-off-by Wen Gong <[email protected]>Signed-off-by Kalle Valo <[email protected]>
Patch applied to ath-next branch of ath.git, thanks.
e6f1c0d26a31 ath10k: restore tx sk_buff of htt header for SDIO
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches