Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8be4eed0 authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

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: default avatarIvo van Doorn <IvDoorn@gmail.com>
Acked-by: default avatarHelmut Schaa <helmut.schaa@googlemail.com>
Acked-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 813f0339

drivers/net/wireless/rt2x00/rt2x00queue.c

+3 −6
Original line number Diff line number Diff line
@@ -452,12 +452,9 @@ static void rt2x00queue_write_tx_descriptor(struct queue_entry *entry, 
	rt2x00debug_dump_frame(queue->rt2x00dev, DUMP_FRAME_TX, entry->skb);

}



static void rt2x00queue_kick_tx_queue(struct queue_entry *entry,

static void rt2x00queue_kick_tx_queue(struct data_queue *queue,

				      struct txentry_desc *txdesc)

{

	struct data_queue *queue = entry->queue;

	struct rt2x00_dev *rt2x00dev = queue->rt2x00dev;



	/*

	 * Check if we need to kick the queue, there are however a few rules

	 *	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, 
	 */

	if (rt2x00queue_threshold(queue) ||

	    !test_bit(ENTRY_TXD_BURST, &txdesc->flags))

		rt2x00dev->ops->lib->kick_tx_queue(queue);

		queue->rt2x00dev->ops->lib->kick_tx_queue(queue);

}



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, 


	rt2x00queue_index_inc(queue, Q_INDEX);

	rt2x00queue_write_tx_descriptor(entry, &txdesc);

	rt2x00queue_kick_tx_queue(entry, &txdesc);

	rt2x00queue_kick_tx_queue(queue, &txdesc);



	return 0;

}