From: Johannes Berg <johannes@sipsolutions.net>
To: Randy Dunlap <rdunlap@xenotime.net>,
John Linville <linville@tuxdriver.com>
Cc: linux-next@vger.kernel.org, linux-wireless@vger.kernel.org
Subject: [PATCH] b43legacy: fix build errors when DMA or PIO are not selected
Date: Sat, 24 May 2008 20:07:55 +0200 [thread overview]
Message-ID: <1211652475.18247.4.camel@johannes.berg> (raw)
In-Reply-To: <20080523102811.1dfc50df.rdunlap@xenotime.net> (sfid-20080523_192821_931342_75EA810D)
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>
---
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;
}
prev parent reply other threads:[~2008-05-24 18:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-23 17:28 b43legacy build error in 20080523 Randy Dunlap
2008-05-24 18:07 ` Johannes Berg [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1211652475.18247.4.camel@johannes.berg \
--to=johannes@sipsolutions.net \
--cc=linux-next@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=rdunlap@xenotime.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).