2010-09-14 22:53:54 +00:00
|
|
|
--- a/drivers/net/wireless/b43/Makefile
|
|
|
|
|
+++ b/drivers/net/wireless/b43/Makefile
|
2010-10-19 22:11:21 +00:00
|
|
|
@@ -14,7 +14,7 @@ b43-y += xmit.o
|
2010-09-14 22:53:54 +00:00
|
|
|
b43-y += lo.o
|
|
|
|
|
b43-y += wa.o
|
|
|
|
|
b43-y += dma.o
|
|
|
|
|
-b43-y += pio.o
|
|
|
|
|
+# b43-y += pio.o
|
|
|
|
|
b43-y += rfkill.o
|
|
|
|
|
b43-$(CONFIG_B43_LEDS) += leds.o
|
|
|
|
|
b43-$(CONFIG_B43_PCMCIA) += pcmcia.o
|
|
|
|
|
--- a/drivers/net/wireless/b43/main.c
|
|
|
|
|
+++ b/drivers/net/wireless/b43/main.c
|
2010-12-18 02:00:10 +00:00
|
|
|
@@ -1812,9 +1812,11 @@ static void b43_do_interrupt_thread(stru
|
2010-09-14 22:53:54 +00:00
|
|
|
dma_reason[4], dma_reason[5]);
|
|
|
|
|
b43err(dev->wl, "This device does not support DMA "
|
|
|
|
|
"on your system. It will now be switched to PIO.\n");
|
|
|
|
|
+#if 0
|
|
|
|
|
/* Fall back to PIO transfers if we get fatal DMA errors! */
|
|
|
|
|
dev->use_pio = 1;
|
|
|
|
|
b43_controller_restart(dev, "DMA error");
|
|
|
|
|
+#endif
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if (merged_dma_reason & B43_DMAIRQ_NONFATALMASK) {
|
|
|
|
|
--- a/drivers/net/wireless/b43/pio.h
|
|
|
|
|
+++ b/drivers/net/wireless/b43/pio.h
|
|
|
|
|
@@ -151,15 +151,34 @@ static inline void b43_piorx_write32(str
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-int b43_pio_init(struct b43_wldev *dev);
|
|
|
|
|
-void b43_pio_free(struct b43_wldev *dev);
|
|
|
|
|
+static inline int b43_pio_init(struct b43_wldev *dev)
|
|
|
|
|
+{
|
|
|
|
|
+ return 0;
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+static inline void b43_pio_free(struct b43_wldev *dev)
|
|
|
|
|
+{
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+static inline int b43_pio_tx(struct b43_wldev *dev, struct sk_buff *skb)
|
|
|
|
|
+{
|
|
|
|
|
+ return 0;
|
|
|
|
|
+}
|
|
|
|
|
|
|
|
|
|
-int b43_pio_tx(struct b43_wldev *dev, struct sk_buff *skb);
|
|
|
|
|
-void b43_pio_handle_txstatus(struct b43_wldev *dev,
|
|
|
|
|
- const struct b43_txstatus *status);
|
|
|
|
|
-void b43_pio_rx(struct b43_pio_rxqueue *q);
|
|
|
|
|
+static inline void b43_pio_handle_txstatus(struct b43_wldev *dev,
|
|
|
|
|
+ const struct b43_txstatus *status)
|
|
|
|
|
+{
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+static inline void b43_pio_rx(struct b43_pio_rxqueue *q)
|
|
|
|
|
+{
|
|
|
|
|
+}
|
|
|
|
|
|
|
|
|
|
-void b43_pio_tx_suspend(struct b43_wldev *dev);
|
|
|
|
|
-void b43_pio_tx_resume(struct b43_wldev *dev);
|
|
|
|
|
+static inline void b43_pio_tx_suspend(struct b43_wldev *dev)
|
|
|
|
|
+{
|
|
|
|
|
+}
|
|
|
|
|
+static inline void b43_pio_tx_resume(struct b43_wldev *dev)
|
|
|
|
|
+{
|
|
|
|
|
+}
|
|
|
|
|
|
|
|
|
|
#endif /* B43_PIO_H_ */
|
