summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/p54/p54pci.h
diff options
context:
space:
mode:
authorChristian Lamparter <chunkeey@googlemail.com>2010-01-17 23:19:25 +0100
committerJohn W. Linville <linville@tuxdriver.com>2010-01-19 16:43:12 -0500
commitd713804c6032b95cd3035014e16fadebb9655c6f (patch)
tree45a67bdae414c6610af651ae6d62df494224282a /drivers/net/wireless/p54/p54pci.h
parent288c8ce8047695fd8872dd5db3ef21a9679c402f (diff)
downloadblackbird-op-linux-d713804c6032b95cd3035014e16fadebb9655c6f.tar.gz
blackbird-op-linux-d713804c6032b95cd3035014e16fadebb9655c6f.zip
p54pci: move tx cleanup into tasklet
This patch moves the tx cleanup routines out of the critical interrupt context and into the (previously known as rx) tasklet. The main goal of this operation is to remove the extensive usage of spin_lock_irqsaves in the generic p54common library. The next step would be to modify p54usb to do the rx processing inside a tasklet (just like usbnet). Signed-off-by: Christian Lamparter <chunkeey@googlemail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/p54/p54pci.h')
-rw-r--r--drivers/net/wireless/p54/p54pci.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/p54/p54pci.h b/drivers/net/wireless/p54/p54pci.h
index fbb683953fb2..2feead617a3b 100644
--- a/drivers/net/wireless/p54/p54pci.h
+++ b/drivers/net/wireless/p54/p54pci.h
@@ -92,7 +92,7 @@ struct p54p_priv {
struct p54_common common;
struct pci_dev *pdev;
struct p54p_csr __iomem *map;
- struct tasklet_struct rx_tasklet;
+ struct tasklet_struct tasklet;
const struct firmware *firmware;
spinlock_t lock;
struct p54p_ring_control *ring_control;
@@ -101,8 +101,8 @@ struct p54p_priv {
u32 rx_idx_mgmt, tx_idx_mgmt;
struct sk_buff *rx_buf_data[8];
struct sk_buff *rx_buf_mgmt[4];
- void *tx_buf_data[32];
- void *tx_buf_mgmt[4];
+ struct sk_buff *tx_buf_data[32];
+ struct sk_buff *tx_buf_mgmt[4];
struct completion boot_comp;
};
OpenPOWER on IntegriCloud