- patches.suse/slab-handle-memoryless-nodes-v2a.patch: Refresh.

[linux-flexiantxendom0-3.2.10.git] / drivers / net / wireless / b43 / b43.h

diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h
index 6607162..fe3bf94 100644 (file)
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
@@ -26,8 +26,6 @@
 # define B43_DEBUG     0
 #endif
 
-#define B43_RX_MAX_SSI                 60
-
 /* MMIO offsets */
 #define B43_MMIO_DMA0_REASON           0x20
 #define B43_MMIO_DMA0_IRQ_MASK         0x24
@@ -749,12 +747,6 @@ struct b43_wldev {
 #endif
 };
 
-/*
- * Include goes here to avoid a dependency problem.
- * A better fix would be to integrate xmit.h into b43.h.
- */
-#include "xmit.h"
-
 /* Data structure for the WLAN parts (802.11 cores) of the b43 chip. */
 struct b43_wl {
        /* Pointer to the active wireless device on this chip */
@@ -830,13 +822,9 @@ struct b43_wl {
        struct b43_leds leds;
 
 #ifdef CONFIG_B43_PIO
-       /*
-        * RX/TX header/tail buffers used by the frame transmit functions.
-        */
-       struct b43_rxhdr_fw4 rxhdr;
-       struct b43_txhdr txhdr;
-       u8 rx_tail[4];
-       u8 tx_tail[4];
+       /* Kmalloc'ed scratch space for PIO TX/RX. Protected by wl->mutex. */
+       u8 pio_scratchspace[110] __attribute__((__aligned__(8)));
+       u8 pio_tailspace[4] __attribute__((__aligned__(8)));
 #endif /* CONFIG_B43_PIO */
 };