wifi: cfg80211: stop exporting wext symbols

CFG80211_WEXT_EXPORT is no longer needed, if we only make
ipw2200 return the static name for SIOCGIWNAME itself.

Link: https://patch.msgid.link/20241007211431.8d4a7242ce92.I66ceb885ddfa52c368feeea1ea884bf988c525f2@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/ipw2x00/Kconfig b/drivers/net/wireless/intel/ipw2x00/Kconfig
index ce34118f1e9011286b386c052fcfbc815c3bc8a2..5e98be664d388552fd5e738e06738f4d968bf8e4 100644 (file)
--- a/drivers/net/wireless/intel/ipw2x00/Kconfig
+++ b/drivers/net/wireless/intel/ipw2x00/Kconfig
@@ -65,7 +65,6 @@ config IPW2100_DEBUG
 config IPW2200
        tristate "Intel PRO/Wireless 2200BG and 2915ABG Network Connection"
        depends on PCI && CFG80211
-       select CFG80211_WEXT_EXPORT
        select WIRELESS_EXT
        select WEXT_PRIV
        select FW_LOADER

diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2200.c b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
index 0008b4615731b7c65ba5458783b66fe6d3129a60..c0e9d2109e341b5712da2261c1e75897560aa636 100644 (file)
--- a/drivers/net/wireless/intel/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
@@ -6463,6 +6463,14 @@ static int ipw_set_rsn_capa(struct ipw_priv *priv,
  * WE-18 support
  */
 
+static int ipw_wx_get_name(struct net_device *dev,
+                          struct iw_request_info *info,
+                          union iwreq_data *wrqu, char *extra)
+{
+       strcpy(wrqu->name, "IEEE 802.11");
+       return 0;
+}
+
 /* SIOCSIWGENIE */
 static int ipw_wx_set_genie(struct net_device *dev,
                            struct iw_request_info *info,
@@ -9826,7 +9834,7 @@ static int ipw_wx_sw_reset(struct net_device *dev,
 
 /* Rebase the WE IOCTLs to zero for the handler array */
 static iw_handler ipw_wx_handlers[] = {
-       IW_HANDLER(SIOCGIWNAME, cfg80211_wext_giwname),
+       IW_HANDLER(SIOCGIWNAME, ipw_wx_get_name),
        IW_HANDLER(SIOCSIWFREQ, ipw_wx_set_freq),
        IW_HANDLER(SIOCGIWFREQ, ipw_wx_get_freq),
        IW_HANDLER(SIOCSIWMODE, ipw_wx_set_mode),

diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig
index 8c8bd8b7570873686038ccd4873d85df6e54d863..2d67b5f2010ed2aacbf3a1d854e6d752c339b803 100644 (file)
--- a/net/wireless/Kconfig
+++ b/net/wireless/Kconfig
@@ -185,19 +185,12 @@ config CFG80211_CRDA_SUPPORT
          If unsure, say Y.
 
 config CFG80211_WEXT
-       bool "cfg80211 wireless extensions compatibility" if !CFG80211_WEXT_EXPORT
+       bool "cfg80211 wireless extensions compatibility"
        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.
 
-config CFG80211_WEXT_EXPORT
-       bool
-       help
-         Drivers should select this option if they require cfg80211's
-         wext compatibility symbols to be exported.
-
 config CFG80211_KUNIT_TEST
        tristate "KUnit tests for cfg80211" if !KUNIT_ALL_TESTS
        depends on KUNIT

diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index 59a90bf3c0d65bbd3e669625a20ffbe25f4cce9c..8ba618f4734f756af0c8ce965df6343102757d0c 100644 (file)
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -3594,7 +3594,6 @@ int cfg80211_wext_siwscan(struct net_device *dev,
        kfree(creq);
        return err;
 }
-EXPORT_WEXT_HANDLER(cfg80211_wext_siwscan);
 
 static char *ieee80211_scan_add_ies(struct iw_request_info *info,
                                    const struct cfg80211_bss_ies *ies,
@@ -3966,5 +3965,4 @@ int cfg80211_wext_giwscan(struct net_device *dev,
 
        return res;
 }
-EXPORT_WEXT_HANDLER(cfg80211_wext_giwscan);
 #endif

diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index cd9f8f6e298b0e345b2c1ae3f1b8218ecd45215f..0c8d3797a02e089d8ddb8b819c9ed795daf631f4 100644 (file)
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c
@@ -30,7 +30,6 @@ int cfg80211_wext_giwname(struct net_device *dev,
        strcpy(wrqu->name, "IEEE 802.11");
        return 0;
 }
-EXPORT_WEXT_HANDLER(cfg80211_wext_giwname);
 
 int cfg80211_wext_siwmode(struct net_device *dev, struct iw_request_info *info,
                          union iwreq_data *wrqu, char *extra)
@@ -69,7 +68,6 @@ int cfg80211_wext_siwmode(struct net_device *dev, struct iw_request_info *info,
 
        return ret;
 }
-EXPORT_WEXT_HANDLER(cfg80211_wext_siwmode);
 
 int cfg80211_wext_giwmode(struct net_device *dev, struct iw_request_info *info,
                          union iwreq_data *wrqu, char *extra)
@@ -105,7 +103,6 @@ int cfg80211_wext_giwmode(struct net_device *dev, struct iw_request_info *info,
        }
        return 0;
 }
-EXPORT_WEXT_HANDLER(cfg80211_wext_giwmode);
 
 
 int cfg80211_wext_giwrange(struct net_device *dev,
@@ -220,7 +217,6 @@ int cfg80211_wext_giwrange(struct net_device *dev,
 
        return 0;
 }
-EXPORT_WEXT_HANDLER(cfg80211_wext_giwrange);
 
 
 /**
@@ -281,7 +277,6 @@ out:
        wiphy_unlock(&rdev->wiphy);
        return err;
 }
-EXPORT_WEXT_HANDLER(cfg80211_wext_siwrts);
 
 int cfg80211_wext_giwrts(struct net_device *dev,
                         struct iw_request_info *info,
@@ -296,7 +291,6 @@ int cfg80211_wext_giwrts(struct net_device *dev,
 
        return 0;
 }
-EXPORT_WEXT_HANDLER(cfg80211_wext_giwrts);
 
 int cfg80211_wext_siwfrag(struct net_device *dev,
                          struct iw_request_info *info,
@@ -327,7 +321,6 @@ out:
 
        return err;
 }
-EXPORT_WEXT_HANDLER(cfg80211_wext_siwfrag);
 
 int cfg80211_wext_giwfrag(struct net_device *dev,
                          struct iw_request_info *info,
@@ -342,7 +335,6 @@ int cfg80211_wext_giwfrag(struct net_device *dev,
 
        return 0;
 }
-EXPORT_WEXT_HANDLER(cfg80211_wext_giwfrag);
 
 static int cfg80211_wext_siwretry(struct net_device *dev,
                                  struct iw_request_info *info,
@@ -413,7 +405,6 @@ int cfg80211_wext_giwretry(struct net_device *dev,
 
        return 0;
 }
-EXPORT_WEXT_HANDLER(cfg80211_wext_giwretry);
 
 static int cfg80211_set_encryption(struct cfg80211_registered_device *rdev,
                                   struct net_device *dev, bool pairwise,

diff --git a/net/wireless/wext-compat.h b/net/wireless/wext-compat.h
index c02eb789e6762267005983c1ed7b5efb951e000c..8251ca5df8aebc933b5b1ce25ade0b82f4cb34f5 100644 (file)
--- a/net/wireless/wext-compat.h
+++ b/net/wireless/wext-compat.h
@@ -5,12 +5,6 @@
 #include <net/iw_handler.h>
 #include <linux/wireless.h>
 
-#ifdef CONFIG_CFG80211_WEXT_EXPORT
-#define EXPORT_WEXT_HANDLER(h) EXPORT_SYMBOL_GPL(h)
-#else
-#define EXPORT_WEXT_HANDLER(h)
-#endif /* CONFIG_CFG80211_WEXT_EXPORT */
-
 int cfg80211_ibss_wext_siwfreq(struct net_device *dev,
                               struct iw_request_info *info,
                               struct iw_freq *wextfreq, char *extra);