[ath9k-devel] [PATCH 0/2] ath10k: wmi fixes

[ath9k-devel] [PATCH 0/2] ath10k: wmi fixes

[Michal Kazior]

Michal Kazior (2):
  ath10k: use skb_queue_purge() instead of custom loop
  ath10k: fix mgmt rx processing

 drivers/net/wireless/ath/ath10k/wmi.c |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

-- 
1.7.9.5

[ath9k-devel] [PATCH 1/2] ath10k: use skb_queue_purge() instead of custom loop

[Michal Kazior]

Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
---
 drivers/net/wireless/ath/ath10k/wmi.c |   11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
index 4197463..4d1c5d8 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -1089,21 +1089,12 @@ int ath10k_wmi_attach(struct ath10k *ar)
 
 void ath10k_wmi_detach(struct ath10k *ar)
 {
-	struct sk_buff *skb;
-
 	/* HTC should've drained the packets already */
 	if (WARN_ON(atomic_read(&ar->wmi.pending_tx_count) > 0))
 		ath10k_warn("there are still pending packets\n");
 
 	cancel_work_sync(&ar->wmi.wmi_event_work);
-
-	for (;;) {
-		skb = skb_dequeue(&ar->wmi.wmi_event_list);
-		if (!skb)
-			break;
-
-		dev_kfree_skb_any(skb);
-	}
+	skb_queue_purge(&ar->wmi.wmi_event_list);
 }
 
 int ath10k_wmi_connect_htc_service(struct ath10k *ar)
-- 
1.7.9.5

[ath9k-devel] [PATCH 2/2] ath10k: fix mgmt rx processing

[Michal Kazior]

This fixes a poorly resolved conflict by myself.
This fixes a warning from mac80211 as we were
submitting skbuff from an incorrect context.

Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
---
 drivers/net/wireless/ath/ath10k/wmi.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
index 4d1c5d8..d94e339 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -1063,6 +1063,7 @@ static void ath10k_wmi_process_rx(void *ptr, struct sk_buff *skb)
 	 * thus can't be defered to a worker thread */
 	switch (event_id) {
 	case WMI_HOST_SWBA_EVENTID:
+	case WMI_MGMT_RX_EVENTID:
 		ath10k_wmi_event_process(ar, skb);
 		return;
 	default:
-- 
1.7.9.5

[ath9k-devel] [PATCH 0/2] ath10k: wmi fixes

[Kalle Valo]

Michal Kazior <michal.kazior@tieto.com> writes:

> Michal Kazior (2):
>   ath10k: use skb_queue_purge() instead of custom loop
>   ath10k: fix mgmt rx processing

Thanks, both patches applied.

-- 
Kalle Valo