diff options
author | Helmut Schaa <helmut.schaa@googlemail.com> | 2010-04-15 03:13:13 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-04-16 15:32:00 -0400 |
commit | 410866930ea1929b0fdfb533dd84ddaa234b06e4 (patch) | |
tree | fabd7bbb75d6825ff9854fef11ddf687b04bfd1b /drivers/net/wireless/rt2x00/rt2x00queue.c | |
parent | 7834704be4777fc0ed67c4486ef8c5691078d135 (diff) |
rt2x00: add txdesc parameter to write_tx_data
Extend the write_tx_data callback with a txdesc parameter to allow
access to the tx desciptor while preparing the tx data.
Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00queue.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00queue.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c index 0b4801a14601..a68cf90f6c4e 100644 --- a/drivers/net/wireless/rt2x00/rt2x00queue.c +++ b/drivers/net/wireless/rt2x00/rt2x00queue.c | |||
@@ -525,7 +525,8 @@ int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb, | |||
525 | * call failed. Since we always return NETDEV_TX_OK to mac80211, | 525 | * call failed. Since we always return NETDEV_TX_OK to mac80211, |
526 | * this frame will simply be dropped. | 526 | * this frame will simply be dropped. |
527 | */ | 527 | */ |
528 | if (unlikely(queue->rt2x00dev->ops->lib->write_tx_data(entry))) { | 528 | if (unlikely(queue->rt2x00dev->ops->lib->write_tx_data(entry, |
529 | &txdesc))) { | ||
529 | clear_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags); | 530 | clear_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags); |
530 | entry->skb = NULL; | 531 | entry->skb = NULL; |
531 | return -EIO; | 532 | return -EIO; |