From: Christian Lamparter <chunkeey@googlemail.com>
Date: Thu, 10 Mar 2011 23:53:25 +0000 (+0100)
Subject: carl9170 firmware: optimize tx_status hot-path
X-Git-Tag: 1.9.4~26^2~2
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=43fb7f27ef405582bc104cc8bf2ef451aa10b8b8;p=carl9170fw.git

carl9170 firmware: optimize tx_status hot-path

Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
---

diff --git a/carlfw/src/wlan.c b/carlfw/src/wlan.c
index 4e0feaf..cb4d9b0 100644
--- a/carlfw/src/wlan.c
+++ b/carlfw/src/wlan.c
@@ -356,9 +356,7 @@ static void _wlan_tx(struct dma_desc *desc)
 static bool wlan_tx_status(struct dma_queue *queue,
 			   struct dma_desc *desc)
 {
-	struct ar9170_tx_frame *frame = DESC_PAYLOAD(desc);
 	struct carl9170_tx_superframe *super = get_super(desc);
-	struct ieee80211_hdr *hdr = &super->f.data.i3e;
 	unsigned int qidx = super->s.queue;
 	bool txfail, success;
 
@@ -381,7 +379,7 @@ static bool wlan_tx_status(struct dma_queue *queue,
 			 * order.
 			 */
 
-			if (!frame->hdr.mac.ampdu) {
+			if (!super->f.hdr.mac.ampdu) {
 				/*
 				 * 802.11 - 7.1.3.1.5.
 				 * set "Retry Field" for consecutive attempts
@@ -389,8 +387,8 @@ static bool wlan_tx_status(struct dma_queue *queue,
 				 * Note: For AMPDU see:
 				 * 802.11n 9.9.1.6 "Retransmit Procedures"
 				 */
-
-				hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_RETRY);
+				super->f.data.i3e.frame_control |=
+					cpu_to_le16(IEEE80211_FCTL_RETRY);
 			}
 
 			if (txfail) {
@@ -464,7 +462,6 @@ static bool wlan_tx_status(struct dma_queue *queue,
 static void handle_tx_completion(void)
 {
 	struct dma_desc *desc;
-	unsigned int map = 0;
 	int i;
 
 	for (i = AR9170_TXQ_SPECIAL; i >= AR9170_TXQ0; i--) {
@@ -480,10 +477,9 @@ static void handle_tx_completion(void)
 
 		wlan_tx_ampdu_end(i);
 		if (!queue_empty(&fw.wlan.tx_queue[i]))
-			map |= BIT(i);
+			wlan_trigger(BIT(i));
 
 	}
-	wlan_trigger(map);
 }
 
 void __hot wlan_tx(struct dma_desc *desc)