Skip to contentSkip to conversation

staging wlan-ng: fix to allow driver to be built on 2.6.33-rc6

PATCH In review Richard Kennedy 2 participants 2 messages Feb 4, 2010 – Feb 8, 2010 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging wlan-ng: fix to allow driver to be built on 2.6.33-rc6

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.

----
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

drivers/staging/wlan-ng/Kconfig +3 -2
index f44294b..41c9fda 100644
@@ -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
drivers/staging/wlan-ng/p80211wext.c +0 -4
index 74d8022..8f17dfb 100644
@@ -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
 };
 
#1 lore raw
Quoted 9 lines · Richard Kennedy

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.

Quoted 7 lines

----
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.

Oops, i already have a patch in my tree that fixes this, so I just applid the second part of your patch, as the cleanup is valie.

thanks,

greg k-h