Skip to contentSkip to conversation

rt2x00 : fix txdone implementation

PATCH In review Alban Browaeys 2 participants 2 messages Feb 25, 2010 Networking drivers (wireless)

lore
Share & tools
lore
#0 lore raw

PATCH 2/2 rt2x00 : fix txdone implementation

Properly move to the headroom position in dma mapped skb. The hw extra headroom is now taken into account.

---
 drivers/net/wireless/rt2x00/rt2800pci.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/wireless/rt2x00/rt2800pci.c +1 -1
index 46b06af..fbeff5c 100644
@@ -966,7 +966,7 @@ static void rt2800pci_txdone(struct rt2x00_dev *rt2x00dev)
 		/* Check if we got a match by looking at WCID/ACK/PID
 		 * fields */
 		txwi = (__le32 *)(entry->skb->data -
-				  rt2x00dev->hw->extra_tx_headroom);
+				  rt2x00dev->ops->extra_tx_headroom);
 
 		rt2x00_desc_read(txwi, 1, &word);
 		tx_wcid = rt2x00_get_field32(word, TXWI_W1_WIRELESS_CLI_ID);
Signature · 1 line
1.7.0
#1 lore raw
Quoted 22 lines · Alban Browaeys

Properly move to the headroom position in dma mapped skb. The hw extra headroom is now taken into account.

---
 drivers/net/wireless/rt2x00/rt2800pci.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/wireless/rt2x00/rt2800pci.c +1 -1
index 46b06af..fbeff5c 100644
@@ -966,7 +966,7 @@ static void rt2800pci_txdone(struct rt2x00_dev
 *rt2x00dev)
         /* Check if we got a match by looking at WCID/ACK/PID
          * fields */
         txwi = (__le32 *)(entry->skb->data -
-                  rt2x00dev->hw->extra_tx_headroom);
+                  rt2x00dev->ops->extra_tx_headroom);
 
         rt2x00_desc_read(txwi, 1, &word);
Quoted 1 line
         tx_wcid = rt2x00_get_field32(word, TXWI_W1_WIRELESS_CLI_ID);

This seems to be fixing an issue with your first patch. Please fold this fix into the first patch and submit a single "working" patch.

---
Gertjan.