2008-05-23 17:28:15

by Randy Dunlap

[permalink] [raw]
Subject: b43legacy build error in 20080523

bleg2.out:/local/linsrc/linux-next-20080523/drivers/net/wireless/b43legacy/dma.h:325: warning: 'struct ieee80211_tx_control' declared inside parameter list
bleg2.out:/local/linsrc/linux-next-20080523/drivers/net/wireless/b43legacy/dma.h:325: warning: its scope is only this definition or declaration, which is probably not what you want
bleg2.out:/local/linsrc/linux-next-20080523/drivers/net/wireless/b43legacy/main.c:2378: error: too few arguments to function 'b43legacy_dma_tx'
bleg2.out:make[5]: *** [drivers/net/wireless/b43legacy/main.o] Error 1

config attached.

---
~Randy


Attachments:
config-b43leg (22.79 kB)

2008-05-24 18:08:17

by Johannes Berg

[permalink] [raw]
Subject: [PATCH] b43legacy: fix build errors when DMA or PIO are not selected

Currently, b43legacy is broken due to

commit fbad4598ca826b994d0fd4ce3deebc9cd1960b31
Author: Johannes Berg <[email protected]>
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 <[email protected]>
---
drivers/net/wireless/b43legacy/dma.h | 3 +--
drivers/net/wireless/b43legacy/pio.h | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)

--- everything.orig/drivers/net/wireless/b43legacy/dma.h 2008-05-24 20:01:48.000000000 +0200
+++ everything/drivers/net/wireless/b43legacy/dma.h 2008-05-24 20:01:55.000000000 +0200
@@ -321,8 +321,7 @@ void b43legacy_dma_get_tx_stats(struct b
}
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;
}
--- everything.orig/drivers/net/wireless/b43legacy/pio.h 2008-05-24 20:02:05.000000000 +0200
+++ everything/drivers/net/wireless/b43legacy/pio.h 2008-05-24 20:02:12.000000000 +0200
@@ -130,8 +130,7 @@ void b43legacy_pio_free(struct b43legacy
}
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;
}