From: Richard Kennedy <richard@rsk.demon.co.uk>
To: Greg Kroah-Hartman <greg@kroah.com>
Cc: lkml <linux-kernel@vger.kernel.org>, devel@driverdev.osuosl.org
Subject: [PATCH] staging wlan-ng: fix to allow driver to be built on 2.6.33-rc6
Date: Thu, 04 Feb 2010 11:33:49 +0000 [thread overview]
Message-ID: <1265283229.2175.10.camel@localhost> (raw)
Due to the re-factoring of wext in commit
3d23e349d807177eaf519d444677cee86b1a04cf
WIRELESS_EXT must now be selected in Kconfig to allow this driver to be
built.
Also remove iw_handle_def private initialisations as they are no longer
need these.
Signed-off-by: Richard Kennedy <richard@rsk.demon.co.uk>
----
Hi Greg,
I hadn't built this driver for a while & just noticed that it doesn't
built on 2.6.33-rc6.
Here's a minimal fix to at least get it going.
I didn't add the WEXT_SPY support as I've never used it & don't really
know how to test it. But if someone needs it, I can give it a try.
patch against 2.6.33-rc6
Tested on fedora, and with the fix the card in my laptop works :)
regards
Richard
diff --git a/drivers/staging/wlan-ng/Kconfig b/drivers/staging/wlan-ng/Kconfig
index f44294b..41c9fda 100644
--- a/drivers/staging/wlan-ng/Kconfig
+++ b/drivers/staging/wlan-ng/Kconfig
@@ -1,6 +1,7 @@
config PRISM2_USB
- tristate "Prism2.5/3 USB driver"
- depends on WLAN && USB && WIRELESS_EXT
+ tristate "Prism2.5/3 WLAN USB driver"
+ depends on WLAN && USB
+ select WIRELESS_EXT
default n
---help---
This is the wlan-ng prism 2.5/3 USB driver for a wide range of
diff --git a/drivers/staging/wlan-ng/p80211wext.c b/drivers/staging/wlan-ng/p80211wext.c
index 74d8022..8f17dfb 100644
--- a/drivers/staging/wlan-ng/p80211wext.c
+++ b/drivers/staging/wlan-ng/p80211wext.c
@@ -1729,11 +1729,7 @@ static iw_handler p80211wext_handlers[] = {
struct iw_handler_def p80211wext_handler_def = {
.num_standard = ARRAY_SIZE(p80211wext_handlers),
- .num_private = 0,
- .num_private_args = 0,
.standard = p80211wext_handlers,
- .private = NULL,
- .private_args = NULL,
.get_wireless_stats = p80211wext_get_wireless_stats
};
next reply other threads:[~2010-02-04 11:33 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-04 11:33 Richard Kennedy [this message]
2010-02-08 4:26 ` [PATCH] staging wlan-ng: fix to allow driver to be built on 2.6.33-rc6 Greg KH
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=1265283229.2175.10.camel@localhost \
--to=richard@rsk.demon.co.uk \
--cc=devel@driverdev.osuosl.org \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.