]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
b43legacy: fix build errors when DMA or PIO are not selected
authorJohannes Berg <johannes@sipsolutions.net>
Sat, 24 May 2008 18:07:55 +0000 (20:07 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 3 Jun 2008 19:00:16 +0000 (15:00 -0400)
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>
drivers/net/wireless/b43legacy/dma.h
drivers/net/wireless/b43legacy/pio.h

index 67537a7495ffe56ef942d5930cdf182ca1c02ca2..2f186003c31e5c0ee6c3a88b1215e04703168720 100644 (file)
@@ -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;
 }
index 49310dfaf2d17eac61d6ed8b86a721150eeba8b4..464fec05a06d667ba9a3575abee51da12402e9b7 100644 (file)
@@ -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;
 }