810-b43_no_pio.patch 1.9 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970
  1. --- a/drivers/net/wireless/b43/Makefile
  2. +++ b/drivers/net/wireless/b43/Makefile
  3. @@ -14,7 +14,7 @@ b43-y += xmit.o
  4. b43-y += lo.o
  5. b43-y += wa.o
  6. b43-y += dma.o
  7. -b43-y += pio.o
  8. +# b43-y += pio.o
  9. b43-y += rfkill.o
  10. b43-$(CONFIG_B43_LEDS) += leds.o
  11. b43-$(CONFIG_B43_PCMCIA) += pcmcia.o
  12. --- a/drivers/net/wireless/b43/main.c
  13. +++ b/drivers/net/wireless/b43/main.c
  14. @@ -1812,9 +1812,11 @@ static void b43_do_interrupt_thread(stru
  15. dma_reason[4], dma_reason[5]);
  16. b43err(dev->wl, "This device does not support DMA "
  17. "on your system. It will now be switched to PIO.\n");
  18. +#if 0
  19. /* Fall back to PIO transfers if we get fatal DMA errors! */
  20. dev->use_pio = 1;
  21. b43_controller_restart(dev, "DMA error");
  22. +#endif
  23. return;
  24. }
  25. if (merged_dma_reason & B43_DMAIRQ_NONFATALMASK) {
  26. --- a/drivers/net/wireless/b43/pio.h
  27. +++ b/drivers/net/wireless/b43/pio.h
  28. @@ -151,15 +151,34 @@ static inline void b43_piorx_write32(str
  29. }
  30. -int b43_pio_init(struct b43_wldev *dev);
  31. -void b43_pio_free(struct b43_wldev *dev);
  32. +static inline int b43_pio_init(struct b43_wldev *dev)
  33. +{
  34. + return 0;
  35. +}
  36. +
  37. +static inline void b43_pio_free(struct b43_wldev *dev)
  38. +{
  39. +}
  40. +
  41. +static inline int b43_pio_tx(struct b43_wldev *dev, struct sk_buff *skb)
  42. +{
  43. + return 0;
  44. +}
  45. -int b43_pio_tx(struct b43_wldev *dev, struct sk_buff *skb);
  46. -void b43_pio_handle_txstatus(struct b43_wldev *dev,
  47. - const struct b43_txstatus *status);
  48. -void b43_pio_rx(struct b43_pio_rxqueue *q);
  49. +static inline void b43_pio_handle_txstatus(struct b43_wldev *dev,
  50. + const struct b43_txstatus *status)
  51. +{
  52. +}
  53. +
  54. +static inline void b43_pio_rx(struct b43_pio_rxqueue *q)
  55. +{
  56. +}
  57. -void b43_pio_tx_suspend(struct b43_wldev *dev);
  58. -void b43_pio_tx_resume(struct b43_wldev *dev);
  59. +static inline void b43_pio_tx_suspend(struct b43_wldev *dev)
  60. +{
  61. +}
  62. +static inline void b43_pio_tx_resume(struct b43_wldev *dev)
  63. +{
  64. +}
  65. #endif /* B43_PIO_H_ */