From patchwork Fri Apr 10 22:29:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 460253 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E961E1400B7 for ; Sat, 11 Apr 2015 08:29:35 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756501AbbDJW3V (ORCPT ); Fri, 10 Apr 2015 18:29:21 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:63719 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751560AbbDJW3S (ORCPT ); Fri, 10 Apr 2015 18:29:18 -0400 Received: from wuerfel.localnet ([149.172.15.242]) by mrelayeu.kundenserver.de (mreue002) with ESMTPSA (Nemesis) id 0LgQuz-1ZD3cc1Rkj-00nzX3; Sat, 11 Apr 2015 00:29:15 +0200 From: Arnd Bergmann To: Johannes Berg Cc: "David S. Miller" , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net/wireless: CFG80211_WEXT_EXPORT requires wireless extensions Date: Sat, 11 Apr 2015 00:29:14 +0200 Message-ID: <2303996.H1mYPouv05@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V03:K0:4e5Th1n3pGIodgrDeA/A3uwWxMUWRs3JBOTaedDynbKsUWci5gR iWn4047SlNXF+SPcMf+q0biHGyKui/0345N233FcYdGXMX2XvdtyPNAxsZAnfkgTfEqI/EV trrNtAHU5sw25g5/BuVGFROOakkhcqVzJOH5IakixxoOzfFXS48TBbXrdiX5Gx8Z+yLc/Bu mZ7jwLRAzdm8xucDbGVcQ== X-UI-Out-Filterresults: notjunk:1; Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The CFG80211_WEXT_EXPORT symbol is selected by two drivers that make direct use of compat handlers for the wireless ioctls. However, this has no effect when the wireless extensions themselves are disabled, and results in a link error: ERROR: "cfg80211_wext_giwrts" [drivers/net/wireless/orinoco/orinoco.ko] undefined! ERROR: "cfg80211_wext_siwfrag" [drivers/net/wireless/orinoco/orinoco.ko] undefined! ERROR: "cfg80211_wext_giwname" [drivers/net/wireless/ipw2x00/ipw2200.ko] undefined! This changes the Kconfig logic so that CFG80211_WEXT can not be disabled when CFG80211_WEXT_EXPORT is set. Signed-off-by: Arnd Bergmann Fixes: 2afe38d15cee01 ("cfg80211-wext: export symbols only when needed") --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig index b13dfb4ff001..cb5eef396d5c 100644 --- a/net/wireless/Kconfig +++ b/net/wireless/Kconfig @@ -178,7 +178,6 @@ config CFG80211_WEXT bool "cfg80211 wireless extensions compatibility" depends on CFG80211 select WEXT_CORE - default y if CFG80211_WEXT_EXPORT help Enable this option if you need old userspace for wireless extensions with cfg80211-based drivers. @@ -186,6 +185,7 @@ config CFG80211_WEXT config CFG80211_WEXT_EXPORT bool depends on CFG80211 + select CFG80211_WEXT help Drivers should select this option if they require cfg80211's wext compatibility symbols to be exported.