| Message ID | 1588049126-1490-2-git-send-email-murugana@codeaurora.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 66307ca040575e6200a5d40656e2dee71d9da91c |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | [v4,1/2] ath11k: fix mgmt_tx_wmi cmd sent to FW for deleted vdev | expand |
Sathishkumar Muruganandam <murugana@codeaurora.org> wrote: > In Multi-AP VAP scenario with frequent interface up-down, there is a > chance that ath11k_mgmt_over_wmi_tx_work() will dequeue a skb > corresponding to currently deleted/stopped vdev. > > FW will assert on receiving mgmt_tx_wmi cmd for already deleted vdev. > Hence adding validation checks for arvif present on the corresponding > ar before sending mgmt_tx_wmi cmd. > > Signed-off-by: Sathishkumar Muruganandam <murugana@codeaurora.org> > Signed-off-by: Kalle Valo <kvalo@codeaurora.org> 2 patches applied to ath-next branch of ath.git, thanks. 66307ca04057 ath11k: fix mgmt_tx_wmi cmd sent to FW for deleted vdev 657680cc86ca ath11k: add DBG_MAC prints to track vdev events
diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c index 065b7d6d4ab2..2b3a63ac216c 100644 --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c @@ -3793,15 +3793,30 @@ static void ath11k_mgmt_over_wmi_tx_work(struct work_struct *work) while ((skb = skb_dequeue(&ar->wmi_mgmt_tx_queue)) != NULL) { info = IEEE80211_SKB_CB(skb); - arvif = ath11k_vif_to_arvif(info->control.vif); - - ret = ath11k_mac_mgmt_tx_wmi(ar, arvif, skb); - if (ret) { - ath11k_warn(ar->ab, "failed to transmit management frame %d\n", - ret); + if (!info->control.vif) { + ath11k_warn(ar->ab, "no vif found for mgmt frame, flags 0x%x\n", + info->control.flags); ieee80211_free_txskb(ar->hw, skb); + continue; + } + + arvif = ath11k_vif_to_arvif(info->control.vif); + if (ar->allocated_vdev_map & (1LL << arvif->vdev_id) && + arvif->is_started) { + ret = ath11k_mac_mgmt_tx_wmi(ar, arvif, skb); + if (ret) { + ath11k_warn(ar->ab, "failed to tx mgmt frame, vdev_id %d :%d\n", + arvif->vdev_id, ret); + ieee80211_free_txskb(ar->hw, skb); + } else { + atomic_inc(&ar->num_pending_mgmt_tx); + } } else { - atomic_inc(&ar->num_pending_mgmt_tx); + ath11k_warn(ar->ab, + "dropping mgmt frame for vdev %d, flags 0x%x is_started %d\n", + arvif->vdev_id, info->control.flags, + arvif->is_started); + ieee80211_free_txskb(ar->hw, skb); } } }
In Multi-AP VAP scenario with frequent interface up-down, there is a chance that ath11k_mgmt_over_wmi_tx_work() will dequeue a skb corresponding to currently deleted/stopped vdev. FW will assert on receiving mgmt_tx_wmi cmd for already deleted vdev. Hence adding validation checks for arvif present on the corresponding ar before sending mgmt_tx_wmi cmd. Signed-off-by: Sathishkumar Muruganandam <murugana@codeaurora.org> --- drivers/net/wireless/ath/ath11k/mac.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-)