From: Ivo van Doorn <ivdoorn@gmail.com>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: linux-wireless@vger.kernel.org, users@rt2x00.serialmonkey.com
Subject: [PATCH 02/10] rt2x00: allow txstatus_fifo w/o txstatus_tasklet
Date: Mon, 27 Dec 2010 15:04:54 +0100 [thread overview]
Message-ID: <201012271504.55450.IvDoorn@gmail.com> (raw)
In-Reply-To: <201012271504.30848.IvDoorn@gmail.com>
From: Johannes Stezenbach <js@sig21.net>
When DRIVER_REQUIRE_TXSTATUS_FIFO is set, intialize the
txstatus_fifo, but initialize rt2x00dev->txstatus_tasklet
only when both DRIVER_REQUIRE_TXSTATUS_FIFO and
rt2x00dev->ops->lib->txstatus_tasklet are set.
This allows the txstatus_fifo to be used by rt2800usb which
does not use txstatus_tasklet.
Signed-off-by: Johannes Stezenbach <js@sig21.net>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
---
drivers/net/wireless/rt2x00/rt2x00dev.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index fa74acd..97a8911 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -813,8 +813,7 @@ static int rt2x00lib_probe_hw(struct rt2x00_dev *rt2x00dev)
/*
* Allocate tx status FIFO for driver use.
*/
- if (test_bit(DRIVER_REQUIRE_TXSTATUS_FIFO, &rt2x00dev->flags) &&
- rt2x00dev->ops->lib->txstatus_tasklet) {
+ if (test_bit(DRIVER_REQUIRE_TXSTATUS_FIFO, &rt2x00dev->flags)) {
/*
* Allocate txstatus fifo and tasklet, we use a size of 512
* for the kfifo which is big enough to store 512/4=128 tx
@@ -828,9 +827,10 @@ static int rt2x00lib_probe_hw(struct rt2x00_dev *rt2x00dev)
return status;
/* tasklet for processing the tx status reports. */
- tasklet_init(&rt2x00dev->txstatus_tasklet,
- rt2x00dev->ops->lib->txstatus_tasklet,
- (unsigned long)rt2x00dev);
+ if (rt2x00dev->ops->lib->txstatus_tasklet)
+ tasklet_init(&rt2x00dev->txstatus_tasklet,
+ rt2x00dev->ops->lib->txstatus_tasklet,
+ (unsigned long)rt2x00dev);
}
--
1.7.2.3
next prev parent reply other threads:[~2010-12-27 14:08 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-27 14:04 [PATCH 01/10] rt2x00: simplify txstatus_fifo handling Ivo van Doorn
2010-12-27 14:04 ` Ivo van Doorn [this message]
2010-12-27 14:05 ` [PATCH 03/10] rt2x00: Remove intf->bssid field Ivo van Doorn
2010-12-27 14:05 ` [PATCH 04/10] rt2x00: remove intf->mac field Ivo van Doorn
2010-12-27 14:05 ` [PATCH 05/10] rt2x00: Fix pointer errors Ivo van Doorn
2010-12-27 14:06 ` [PATCH 06/10] rt2x00: Fix panic on frame padding for rt2800 usb devices Ivo van Doorn
2010-12-27 14:06 ` [PATCH 07/10] rt2x00: Remove superfluous assignment of mpdu_density Ivo van Doorn
2010-12-27 14:06 ` [PATCH 08/10] rt2x00: Simplify intf->delayed_flags locking Ivo van Doorn
2010-12-27 14:07 ` [PATCH 09/10] rt2x00: Remove unused interface spinlock Ivo van Doorn
2010-12-27 14:07 ` [PATCH 10/10] rt2x00: Fix comment about removed spinlock 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=201012271504.55450.IvDoorn@gmail.com \
--to=ivdoorn@gmail.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=users@rt2x00.serialmonkey.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).