linux-next: build failure after merge of the wireless-next tree

[Stephen Rothwell]

Hi John,

[I started by reverting commit 161d78555435 "Revert "Staging: rtl8812ae:
remove modules field of rate_control_ops""]

After merging the wireless-next tree, today's linux-next build (x86_64
allmodconfig) failed like this:

In file included from drivers/staging/wlan-ng/p80211netdev.c:91:0:
drivers/staging/wlan-ng/cfg80211.c: In function 'prism2_scan':
drivers/staging/wlan-ng/cfg80211.c:419:10: error: implicit declaration of function 'ieee80211_dsss_chan_to_freq' [-Werror=implicit-function-declaration]
          ieee80211_dsss_chan_to_freq(msg2.dschannel.data)),
          ^

Caused by commit 3ebe8e257307 ("ieee80211: remove function ieee80211_
{dsss_chan_to_freq, freq_to_dsss_chan}").

I disabled the staging tree driver like this:

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Thu, 6 Mar 2014 13:17:16 +1100
Subject: [PATCH] staging: disable Prism2.5/3 USB driver

it is currently broken by changes in the wireless-next tree

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 drivers/staging/wlan-ng/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/staging/wlan-ng/Kconfig b/drivers/staging/wlan-ng/Kconfig
index 426d4efbabc3..56caa46e4791 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 && CFG80211
+	depends on BROKEN
 	select WIRELESS_EXT
 	select WEXT_PRIV
 	default n
-- 
1.9.0

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgpZ94cwd5aha.pgp
Description: PGP signature