2009-10-06 20:36:00

by Randy Dunlap

[permalink] [raw]
Subject: [PATCH -next] wireless: fix CFG80211_WEXT build problems

From: Randy Dunlap <[email protected]>

Fix CFG80211_WEXT build dependencies/errors:

ERROR: "cfg80211_wext_siwscan" [drivers/net/wireless/orinoco/orinoco.ko] undefined!
ERROR: "cfg80211_wext_siwmode" [drivers/net/wireless/orinoco/orinoco.ko] undefined!
ERROR: "cfg80211_wext_giwrange" [drivers/net/wireless/orinoco/orinoco.ko] undefined!
ERROR: "cfg80211_wext_giwmode" [drivers/net/wireless/orinoco/orinoco.ko] undefined!
ERROR: "cfg80211_wext_giwname" [drivers/net/wireless/orinoco/orinoco.ko] undefined!
ERROR: "cfg80211_wext_giwscan" [drivers/net/wireless/orinoco/orinoco.ko] undefined!
ERROR: "cfg80211_wext_giwname" [drivers/net/wireless/ipw2x00/ipw2200.ko] undefined!

Signed-off-by: Randy Dunlap <[email protected]>
---
drivers/net/wireless/ipw2x00/Kconfig | 2 +-
drivers/net/wireless/orinoco/Kconfig | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

--- linux-next-20091006.orig/drivers/net/wireless/ipw2x00/Kconfig
+++ linux-next-20091006/drivers/net/wireless/ipw2x00/Kconfig
@@ -65,7 +65,7 @@ config IPW2100_DEBUG

config IPW2200
tristate "Intel PRO/Wireless 2200BG and 2915ABG Network Connection"
- depends on PCI && WLAN_80211 && CFG80211
+ depends on PCI && WLAN_80211 && CFG80211 && CFG80211_WEXT
select WIRELESS_EXT
select WEXT_SPY
select WEXT_PRIV
--- linux-next-20091006.orig/drivers/net/wireless/orinoco/Kconfig
+++ linux-next-20091006/drivers/net/wireless/orinoco/Kconfig
@@ -1,7 +1,7 @@
config HERMES
tristate "Hermes chipset 802.11b support (Orinoco/Prism2/Symbol)"
depends on (PPC_PMAC || PCI || PCMCIA) && WLAN_80211
- depends on CFG80211
+ depends on CFG80211 && CFG80211_WEXT
select WIRELESS_EXT
select WEXT_SPY
select WEXT_PRIV


2009-10-06 21:35:05

by Johannes Berg

[permalink] [raw]
Subject: Re: [PATCH -next] wireless: fix CFG80211_WEXT build problems

On Tue, 2009-10-06 at 13:27 -0700, Randy Dunlap wrote:
> From: Randy Dunlap <[email protected]>
>
> Fix CFG80211_WEXT build dependencies/errors:
>
> ERROR: "cfg80211_wext_siwscan" [drivers/net/wireless/orinoco/orinoco.ko] undefined!
> ERROR: "cfg80211_wext_siwmode" [drivers/net/wireless/orinoco/orinoco.ko] undefined!
> ERROR: "cfg80211_wext_giwrange" [drivers/net/wireless/orinoco/orinoco.ko] undefined!
> ERROR: "cfg80211_wext_giwmode" [drivers/net/wireless/orinoco/orinoco.ko] undefined!
> ERROR: "cfg80211_wext_giwname" [drivers/net/wireless/orinoco/orinoco.ko] undefined!
> ERROR: "cfg80211_wext_giwscan" [drivers/net/wireless/orinoco/orinoco.ko] undefined!
> ERROR: "cfg80211_wext_giwname" [drivers/net/wireless/ipw2x00/ipw2200.ko] undefined!
>
> Signed-off-by: Randy Dunlap <[email protected]>
> ---
> drivers/net/wireless/ipw2x00/Kconfig | 2 +-
> drivers/net/wireless/orinoco/Kconfig | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> --- linux-next-20091006.orig/drivers/net/wireless/ipw2x00/Kconfig
> +++ linux-next-20091006/drivers/net/wireless/ipw2x00/Kconfig
> @@ -65,7 +65,7 @@ config IPW2100_DEBUG
>
> config IPW2200
> tristate "Intel PRO/Wireless 2200BG and 2915ABG Network Connection"
> - depends on PCI && WLAN_80211 && CFG80211
> + depends on PCI && WLAN_80211 && CFG80211 && CFG80211_WEXT

Interesting approach, thanks. I completely forgot about the
half-converted drivers. The alternative would be to ifdef the code
blobs, but I'm happy with this.

johannes


Attachments:
signature.asc (801.00 B)
This is a digitally signed message part