Skip to contentSkip to conversation

ath10k: don't defer mgmt_rx frames

PATCH New Janusz Dziedzic 2 participants 3 messages Apr 16, 2013 – Apr 18, 2013 Qualcomm Atheros ATH10K wireless driver

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 ath10k: don't defer mgmt_rx frames

Don't defer mgmt_rx frames. Pass them
immediately to mac80211 layer. Also
this will prevent mixing context we will
call ieee80211_rx()/ieee80211_tx_status().
Now this will be called from tasklet.

---
 drivers/net/wireless/ath/ath10k/wmi.c |    3 +++
 1 file changed, 3 insertions(+)
drivers/net/wireless/ath/ath10k/wmi.c +3 -0
index 82debae..2cf9f3b 100644
@@ -1084,6 +1084,9 @@ static void wmi_process_rx(void *ptr, struct sk_buff *skb)
 	case WMI_HOST_SWBA_EVENTID:
 		wmi_event_process(wmi, skb);
 		return;
+	case WMI_MGMT_RX_EVENTID:
+		wmi_event_process(wmi, skb);
+		return;
 	default:
 		break;
 	}
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 2/2 ath10k: don't use irqsave when rx/tx_status

Don't use ieee80211_rx_irqsave()/ieee80211_tx_status_irqsave() while we call this function from tasklet.

---
 drivers/net/wireless/ath/ath10k/txrx.c |    6 +++---
 drivers/net/wireless/ath/ath10k/wmi.c  |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/ath10k/txrx.c +3 -3
index a40d019..0879a70 100644
@@ -81,7 +81,7 @@ void ath10k_data_tx_completed(struct htt_struct *htt,
 			info->flags |= IEEE80211_TX_STAT_ACK;
 		/* fall through */
 	case HTT_DATA_TX_STATUS_NO_ACK:
-		ieee80211_tx_status_irqsafe(htt->ar->hw, txi->u.data.msdu);
+		ieee80211_tx_status(htt->ar->hw, txi->u.data.msdu);
 		break;
 	case HTT_DATA_TX_STATUS_DISCARD:
 		/* fall through */
@@ -260,7 +260,7 @@ void ath10k_process_rx(struct ath10k *ar, struct htt_rx_info *info)
 		   status->freq,
 		   status->band);
 
-	ieee80211_rx_irqsafe(ar->hw, info->skb);
+	ieee80211_rx(ar->hw, info->skb);
 }
 
 void ath10k_mgmt_tx_completed(struct htt_struct *htt,
@@ -295,7 +295,7 @@ void ath10k_mgmt_tx_completed(struct htt_struct *htt,
 		if (!(info->flags & IEEE80211_TX_CTL_NO_ACK))
 			info->flags |= IEEE80211_TX_STAT_ACK;
 
-		ieee80211_tx_status_irqsafe(htt->ar->hw, msdu);
+		ieee80211_tx_status(htt->ar->hw, msdu);
 		break;
 	case HTT_MGMT_TX_STATUS_RETRY:
 		/* fall through */
drivers/net/wireless/ath/ath10k/wmi.c +1 -1
index 2cf9f3b..1a331b6 100644
@@ -390,7 +390,7 @@ static int wmi_event_mgmt_rx(struct ath10k *ar, struct sk_buff *skb)
 	 */
 	skb_trim(skb, buf_len);
 
-	ieee80211_rx_irqsafe(ar->hw, skb);
+	ieee80211_rx(ar->hw, skb);
 	return 0;
 }
 
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH 1/2 ath10k: don't defer mgmt_rx frames

In reply to Janusz Dziedzic
Quoted 7 lines · Janusz Dziedzic

Don't defer mgmt_rx frames. Pass them
immediately to mac80211 layer. Also
this will prevent mixing context we will
call ieee80211_rx()/ieee80211_tx_status().
Now this will be called from tasklet.

Thanks, both applied. Patch 1 had conflicts, I also did a minor change to that patch. Please check.

Signature · 1 line
Kalle Valo