diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-05-24 14:07:55 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-06-03 15:00:16 -0400 |
commit | 553381c430f0e65e87ed1b5cee841a04c8a47b58 (patch) | |
tree | c8d6a6850ac7fa37f3edd3b3cc55e0f9f0265995 | |
parent | b83f4e15e65d94f6f56924b0b06a77a7ca2b4d8a (diff) |
b43legacy: fix build errors when DMA or PIO are not selected
Currently, b43legacy is broken due to
commit fbad4598ca826b994d0fd4ce3deebc9cd1960b31
Author: Johannes Berg <johannes@sipsolutions.net>
Date: Thu May 15 12:55:29 2008 +0200
mac80211: move TX info into skb->cb
when compiled with only PIO or only DMA because I forgot to update two
stubs. This patch fixes it.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/b43legacy/dma.h | 3 | ||||
-rw-r--r-- | drivers/net/wireless/b43legacy/pio.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/b43legacy/dma.h b/drivers/net/wireless/b43legacy/dma.h index 67537a7495ff..2f186003c31e 100644 --- a/drivers/net/wireless/b43legacy/dma.h +++ b/drivers/net/wireless/b43legacy/dma.h | |||
@@ -321,8 +321,7 @@ void b43legacy_dma_get_tx_stats(struct b43legacy_wldev *dev, | |||
321 | } | 321 | } |
322 | static inline | 322 | static inline |
323 | int b43legacy_dma_tx(struct b43legacy_wldev *dev, | 323 | int b43legacy_dma_tx(struct b43legacy_wldev *dev, |
324 | struct sk_buff *skb, | 324 | struct sk_buff *skb) |
325 | struct ieee80211_tx_control *ctl) | ||
326 | { | 325 | { |
327 | return 0; | 326 | return 0; |
328 | } | 327 | } |
diff --git a/drivers/net/wireless/b43legacy/pio.h b/drivers/net/wireless/b43legacy/pio.h index 49310dfaf2d1..464fec05a06d 100644 --- a/drivers/net/wireless/b43legacy/pio.h +++ b/drivers/net/wireless/b43legacy/pio.h | |||
@@ -130,8 +130,7 @@ void b43legacy_pio_free(struct b43legacy_wldev *dev) | |||
130 | } | 130 | } |
131 | static inline | 131 | static inline |
132 | int b43legacy_pio_tx(struct b43legacy_wldev *dev, | 132 | int b43legacy_pio_tx(struct b43legacy_wldev *dev, |
133 | struct sk_buff *skb, | 133 | struct sk_buff *skb) |
134 | struct ieee80211_tx_control *ctl) | ||
135 | { | 134 | { |
136 | return 0; | 135 | return 0; |
137 | } | 136 | } |