diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2008-05-24 20:07:55 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-06-03 15:00:16 -0400 |
| commit | 553381c430f0e65e87ed1b5cee841a04c8a47b58 (patch) | |
| tree | c8d6a6850ac7fa37f3edd3b3cc55e0f9f0265995 | |
| parent | b83f4e15e65d94f6f56924b0b06a77a7ca2b4d8a (diff) | |
| download | kernel_samsung_smdk4412-553381c430f0e65e87ed1b5cee841a04c8a47b58.zip kernel_samsung_smdk4412-553381c430f0e65e87ed1b5cee841a04c8a47b58.tar.gz kernel_samsung_smdk4412-553381c430f0e65e87ed1b5cee841a04c8a47b58.tar.bz2 | |
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 67537a7..2f18600 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, } static inline int b43legacy_dma_tx(struct b43legacy_wldev *dev, - struct sk_buff *skb, - struct ieee80211_tx_control *ctl) + struct sk_buff *skb) { return 0; } diff --git a/drivers/net/wireless/b43legacy/pio.h b/drivers/net/wireless/b43legacy/pio.h index 49310df..464fec0 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) } static inline int b43legacy_pio_tx(struct b43legacy_wldev *dev, - struct sk_buff *skb, - struct ieee80211_tx_control *ctl) + struct sk_buff *skb) { return 0; } |