diff options
author | Ivo van Doorn <IvDoorn@gmail.com> | 2010-11-06 10:48:23 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-11-15 13:26:33 -0500 |
commit | 8be4eed0ea7d8ef38692de878043a949e9db16e8 (patch) | |
tree | fcd2c71f3bd20a5b51a2024aa011c9bb0b1bd323 /drivers/net | |
parent | 813f0339dd739c48607f12dac79ec26c61874226 (diff) |
rt2x00: Fix rt2x00queue_kick_tx_queue arguments
The queue_entry argument to rt2x00queue_kick_tx_queue,
doesn't make sense due to the function name (it is called
kick QUEUE)... But neither do we need the queue_entry, since
we need the data_queue.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Acked-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')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00queue.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c index aa4c8f2dc7df..dc543174dfad 100644 --- a/drivers/net/wireless/rt2x00/rt2x00queue.c +++ b/drivers/net/wireless/rt2x00/rt2x00queue.c | |||
@@ -452,12 +452,9 @@ static void rt2x00queue_write_tx_descriptor(struct queue_entry *entry, | |||
452 | rt2x00debug_dump_frame(queue->rt2x00dev, DUMP_FRAME_TX, entry->skb); | 452 | rt2x00debug_dump_frame(queue->rt2x00dev, DUMP_FRAME_TX, entry->skb); |
453 | } | 453 | } |
454 | 454 | ||
455 | static void rt2x00queue_kick_tx_queue(struct queue_entry *entry, | 455 | static void rt2x00queue_kick_tx_queue(struct data_queue *queue, |
456 | struct txentry_desc *txdesc) | 456 | struct txentry_desc *txdesc) |
457 | { | 457 | { |
458 | struct data_queue *queue = entry->queue; | ||
459 | struct rt2x00_dev *rt2x00dev = queue->rt2x00dev; | ||
460 | |||
461 | /* | 458 | /* |
462 | * Check if we need to kick the queue, there are however a few rules | 459 | * Check if we need to kick the queue, there are however a few rules |
463 | * 1) Don't kick unless this is the last in frame in a burst. | 460 | * 1) Don't kick unless this is the last in frame in a burst. |
@@ -469,7 +466,7 @@ static void rt2x00queue_kick_tx_queue(struct queue_entry *entry, | |||
469 | */ | 466 | */ |
470 | if (rt2x00queue_threshold(queue) || | 467 | if (rt2x00queue_threshold(queue) || |
471 | !test_bit(ENTRY_TXD_BURST, &txdesc->flags)) | 468 | !test_bit(ENTRY_TXD_BURST, &txdesc->flags)) |
472 | rt2x00dev->ops->lib->kick_tx_queue(queue); | 469 | queue->rt2x00dev->ops->lib->kick_tx_queue(queue); |
473 | } | 470 | } |
474 | 471 | ||
475 | int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb, | 472 | int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb, |
@@ -559,7 +556,7 @@ int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb, | |||
559 | 556 | ||
560 | rt2x00queue_index_inc(queue, Q_INDEX); | 557 | rt2x00queue_index_inc(queue, Q_INDEX); |
561 | rt2x00queue_write_tx_descriptor(entry, &txdesc); | 558 | rt2x00queue_write_tx_descriptor(entry, &txdesc); |
562 | rt2x00queue_kick_tx_queue(entry, &txdesc); | 559 | rt2x00queue_kick_tx_queue(queue, &txdesc); |
563 | 560 | ||
564 | return 0; | 561 | return 0; |
565 | } | 562 | } |