diff options
author | Larry Finger <Larry.Finger@lwfinger.net> | 2009-12-10 18:35:01 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-12-28 16:31:28 -0500 |
commit | b02914af4d7020828ce921a572589dd793517c09 (patch) | |
tree | 38ffc3e54ada2aa664c2d9ab0dd7b71fab985db9 /drivers/net/wireless/b43/b43.h | |
parent | 7dc6a7a7635365b140af969e972900866d0bf34b (diff) |
b43: Allow PIO mode to be selected at module load
If userencounter the "Fatal DMA Problem" with a BCM43XX device, and
still wish to use b43 as the driver, their only option is to rebuild
the kernel with CONFIG_B43_FORCE_PIO. This patch removes this option and
allows PIO mode to be selected with a load-time parameter for the module.
Note that the configuration variable CONFIG_B43_PIO is also removed.
Once the DMA problem with the BCM4312 devices is solved, this patch will
likely be reverted.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Tested-by: John Daiker <daikerjohn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/b43/b43.h')
-rw-r--r-- | drivers/net/wireless/b43/b43.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h index fe3bf9491997..2f12a750bc98 100644 --- a/drivers/net/wireless/b43/b43.h +++ b/drivers/net/wireless/b43/b43.h | |||
@@ -821,11 +821,9 @@ struct b43_wl { | |||
821 | /* The device LEDs. */ | 821 | /* The device LEDs. */ |
822 | struct b43_leds leds; | 822 | struct b43_leds leds; |
823 | 823 | ||
824 | #ifdef CONFIG_B43_PIO | ||
825 | /* Kmalloc'ed scratch space for PIO TX/RX. Protected by wl->mutex. */ | 824 | /* Kmalloc'ed scratch space for PIO TX/RX. Protected by wl->mutex. */ |
826 | u8 pio_scratchspace[110] __attribute__((__aligned__(8))); | 825 | u8 pio_scratchspace[110] __attribute__((__aligned__(8))); |
827 | u8 pio_tailspace[4] __attribute__((__aligned__(8))); | 826 | u8 pio_tailspace[4] __attribute__((__aligned__(8))); |
828 | #endif /* CONFIG_B43_PIO */ | ||
829 | }; | 827 | }; |
830 | 828 | ||
831 | static inline struct b43_wl *hw_to_b43_wl(struct ieee80211_hw *hw) | 829 | static inline struct b43_wl *hw_to_b43_wl(struct ieee80211_hw *hw) |
@@ -876,20 +874,9 @@ static inline void b43_write32(struct b43_wldev *dev, u16 offset, u32 value) | |||
876 | 874 | ||
877 | static inline bool b43_using_pio_transfers(struct b43_wldev *dev) | 875 | static inline bool b43_using_pio_transfers(struct b43_wldev *dev) |
878 | { | 876 | { |
879 | #ifdef CONFIG_B43_PIO | ||
880 | return dev->__using_pio_transfers; | 877 | return dev->__using_pio_transfers; |
881 | #else | ||
882 | return 0; | ||
883 | #endif | ||
884 | } | 878 | } |
885 | 879 | ||
886 | #ifdef CONFIG_B43_FORCE_PIO | ||
887 | # define B43_FORCE_PIO 1 | ||
888 | #else | ||
889 | # define B43_FORCE_PIO 0 | ||
890 | #endif | ||
891 | |||
892 | |||
893 | /* Message printing */ | 880 | /* Message printing */ |
894 | void b43info(struct b43_wl *wl, const char *fmt, ...) | 881 | void b43info(struct b43_wl *wl, const char *fmt, ...) |
895 | __attribute__ ((format(printf, 2, 3))); | 882 | __attribute__ ((format(printf, 2, 3))); |