linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ivo van Doorn <ivdoorn@gmail.com>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: linux-wireless@vger.kernel.org
Subject: [PATCH 16/18] rt2x00: Fix rt2x00queue_kick_tx_queue arguments
Date: Sat, 6 Nov 2010 15:48:23 +0100	[thread overview]
Message-ID: <201011061548.24450.IvDoorn@gmail.com> (raw)
In-Reply-To: <201011061548.06660.IvDoorn@gmail.com>

From: Ivo van Doorn <IvDoorn@gmail.com>

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>
---
 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 aa4c8f2..dc54317 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,
 	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;
 }
-- 
1.7.2.3


  reply	other threads:[~2010-11-06 14:49 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-11-06 14:44 [PATCH 01/18] rt2x00: checkpatch.pl error fixes for rt2400pci.h Ivo van Doorn
2010-11-06 14:44 ` [PATCH 02/18] rt2x00: checkpatch.pl error fixes for rt2500pci.h Ivo van Doorn
2010-11-06 14:44   ` [PATCH 03/18] rt2x00: checkpatch.pl error fixes for rt2500usb.c Ivo van Doorn
2010-11-06 14:44     ` [PATCH 04/18] rt2x00: checkpatch.pl error fixes for rt2800.h Ivo van Doorn
2010-11-06 14:45       ` [PATCH 05/18] rt2x00: checkpatch.pl error fixes for rt2800lib.c Ivo van Doorn
2010-11-06 14:45         ` [PATCH 06/18] rt2x00: checkpatch.pl error fixes for rt2800pci.h Ivo van Doorn
2010-11-06 14:45           ` [PATCH 07/18] rt2x00: checkpatch.pl error fixes for rt2800usb.c Ivo van Doorn
2010-11-06 14:45             ` [PATCH 08/18] rt2x00: checkpatch.pl error fixes for rt2800usb.h Ivo van Doorn
2010-11-06 14:46               ` [PATCH 09/18] rt2x00: checkpatch.pl error fixes for rt2x00config.c Ivo van Doorn
2010-11-06 14:46                 ` [PATCH 10/18] rt2x00: checkpatch.pl error fixes for rt2x00dev.c Ivo van Doorn
2010-11-06 14:46                   ` [PATCH 11/18] rt2x00: checkpatch.pl error fixes for rt2x00lib.h Ivo van Doorn
2010-11-06 14:47                     ` [PATCH 12/18] rt2x00: checkpatch.pl error fixes for rt2x00link.c Ivo van Doorn
2010-11-06 14:47                       ` [PATCH 13/18] rt2x00: checkpatch.pl error fixes for rt2x00queue.c Ivo van Doorn
2010-11-06 14:47                         ` [PATCH 14/18] rt2x00: checkpatch.pl error fixes for rt73usb.c Ivo van Doorn
2010-11-06 14:48                           ` [PATCH 15/18] rt2x00: Rename queue->lock to queue->index_lock Ivo van Doorn
2010-11-06 14:48                             ` Ivo van Doorn [this message]
2010-11-06 14:48                               ` [PATCH 17/18] rt2x00: Remove rt2x00lib_toggle_rx Ivo van Doorn
2010-11-06 14:49                                 ` [PATCH 18/18] rt2x00: Add watchdog functions for HW queue Ivo van Doorn

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=201011061548.24450.IvDoorn@gmail.com \
    --to=ivdoorn@gmail.com \
    --cc=linux-wireless@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).