--- drivers/net/wireless/b43/b43.h

+++ drivers/net/wireless/b43/b43.h

@@ -696,6 +696,7 @@ struct b43_wldev {

bool radio_hw_enable; /* saved state of radio hardware enabled state */

bool qos_enabled; /* TRUE, if QoS is used. */

bool hwcrypto_enabled; /* TRUE, if HW crypto acceleration is enabled. */

+ bool use_pio; /* TRUE if next init should use PIO */

/* PHY/Radio device. */

struct b43_phy phy;

@@ -750,12 +751,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,15 +825,9 @@ struct b43_wl {

/* The device LEDs. */

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];

-#endif /* CONFIG_B43_PIO */

+ /* 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)));

};

static inline struct b43_wl *hw_to_b43_wl(struct ieee80211_hw *hw)

@@ -889,20 +878,15 @@ static inline void b43_write32(struct b4

static inline bool b43_using_pio_transfers(struct b43_wldev *dev)

{

-#ifdef CONFIG_B43_PIO

return dev->__using_pio_transfers;

-#else

- return 0;

-#endif

}

#ifdef CONFIG_B43_FORCE_PIO

-# define B43_FORCE_PIO 1

+# define B43_PIO_DEFAULT 1

#else

-# define B43_FORCE_PIO 0

+# define B43_PIO_DEFAULT 0

#endif

-

/* Message printing */

void b43info(struct b43_wl *wl, const char *fmt, ...)

__attribute__ ((format(printf, 2, 3)));