* [PATCH 2/2] rt2x00 : fix txdone implementation
@ 2010-02-25 0:54 Alban Browaeys
2010-02-25 1:58 ` Pavel Roskin
0 siblings, 1 reply; 4+ messages in thread
From: Alban Browaeys @ 2010-02-25 0:54 UTC (permalink / raw)
To: John Linville; +Cc: rt2x00 Users List, linux-wireless, Ivo van Doorn
Properly move to the headroom position in dma mapped skb. The hw extra
headroom is now taken into account.
Signed-off-by: Alban Browaeys <prahal@yahoo.com>
---
drivers/net/wireless/rt2x00/rt2800pci.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c
index 3ac1df0..4e62e84 100644
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
@@ -718,8 +718,8 @@ static void rt2800pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,
rt2x00_desc_write(txd, 1, word);
rt2x00_desc_read(txd, 2, &word);
- rt2x00_set_field32(&word, TXD_W2_SD_PTR1,
- skbdesc->skb_dma + rt2x00dev->ops->extra_tx_headroom);
+ rt2x00_set_field32(&word, TXD_W2_SD_PTR1, skbdesc->skb_dma
+ + rt2x00dev->ops->extra_tx_headroom);
rt2x00_desc_write(txd, 2, word);
rt2x00_desc_read(txd, 3, &word);
@@ -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);
--
1.7.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] rt2x00 : fix txdone implementation
2010-02-25 0:54 [PATCH 2/2] rt2x00 : fix txdone implementation Alban Browaeys
@ 2010-02-25 1:58 ` Pavel Roskin
2010-02-25 13:54 ` Alban Browaeys
0 siblings, 1 reply; 4+ messages in thread
From: Pavel Roskin @ 2010-02-25 1:58 UTC (permalink / raw)
To: prahal; +Cc: John Linville, rt2x00 Users List, linux-wireless, Ivo van Doorn
Quoting Alban Browaeys <prahal@yahoo.com>:
> Properly move to the headroom position in dma mapped skb. The hw extra
> headroom is now taken into account.
>
> Signed-off-by: Alban Browaeys <prahal@yahoo.com>
...
> - rt2x00_set_field32(&word, TXD_W2_SD_PTR1,
> - skbdesc->skb_dma + rt2x00dev->ops->extra_tx_headroom);
> + rt2x00_set_field32(&word, TXD_W2_SD_PTR1, skbdesc->skb_dma
> + + rt2x00dev->ops->extra_tx_headroom);
I think it's just a formatting change. I would not mix formatting
changes with the real fixes. I can understand reformatting code that
is also modified in some other way, but that's even a separate function.
> txwi = (__le32 *)(entry->skb->data -
> - rt2x00dev->hw->extra_tx_headroom);
> + rt2x00dev->ops->extra_tx_headroom);
Now that's a real change.
--
Regards,
Pavel Roskin
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 2/2] rt2x00 : fix txdone implementation
@ 2010-02-25 13:52 Alban Browaeys
0 siblings, 0 replies; 4+ messages in thread
From: Alban Browaeys @ 2010-02-25 13:52 UTC (permalink / raw)
To: John Linville
Cc: rt2x00 Users List, Pavel Roskin, linux-wireless, Ivo van Doorn
Properly move to the headroom position in dma mapped skb. The hw extra
headroom is now taken into account.
Signed-off-by: Alban Browaeys <prahal@yahoo.com>
---
drivers/net/wireless/rt2x00/rt2800pci.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c
index 46b06af..fbeff5c 100644
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
@@ -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);
--
1.7.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] rt2x00 : fix txdone implementation
2010-02-25 1:58 ` Pavel Roskin
@ 2010-02-25 13:54 ` Alban Browaeys
0 siblings, 0 replies; 4+ messages in thread
From: Alban Browaeys @ 2010-02-25 13:54 UTC (permalink / raw)
To: Pavel Roskin
Cc: John Linville, rt2x00 Users List, linux-wireless, Ivo van Doorn
On 25/02/2010 02:58, Pavel Roskin wrote:
> Quoting Alban Browaeys <prahal@yahoo.com>:
>
>> Properly move to the headroom position in dma mapped skb. The hw extra
>> headroom is now taken into account.
>>
>> Signed-off-by: Alban Browaeys <prahal@yahoo.com>
> ...
>> - rt2x00_set_field32(&word, TXD_W2_SD_PTR1,
>> - skbdesc->skb_dma + rt2x00dev->ops->extra_tx_headroom);
>> + rt2x00_set_field32(&word, TXD_W2_SD_PTR1, skbdesc->skb_dma
>> + + rt2x00dev->ops->extra_tx_headroom);
>
> I think it's just a formatting change. I would not mix formatting
> changes with the real fixes. I can understand reformatting code that
> is also modified in some other way, but that's even a separate function.
>
Thank you. There was a real change (I did not meant for to reformat this
line) but it got merged and I did not saw it.
I sent a new version of the patch without the first now uneeded change.
Best regards,
Alban
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-02-25 13:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-25 0:54 [PATCH 2/2] rt2x00 : fix txdone implementation Alban Browaeys
2010-02-25 1:58 ` Pavel Roskin
2010-02-25 13:54 ` Alban Browaeys
-- strict thread matches above, loose matches on Subject: below --
2010-02-25 13:52 Alban Browaeys
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).