Skip to contentSkip to conversation

fix cfg80211 modular compile w/o wext-compat

PATCH New Johannes Berg 1 participant 2 messages Feb 16, 2007 – Feb 17, 2007 802.11 (including cfg80211/NL80211)

lore
Share & tools
lore

Johannes Berg

author maintainer
#0 lore raw

PATCH 1/1 fix cfg80211 modular compile w/o wext-compat

The static inlines that are supposed to be used w/o wext-compat to init wext-compat were done with the wrong #ifdef. This fixes it.

net/wireless/wext.h +5 -1
@@ -29,10 +29,14 @@ int wireless_process_ioctl(struct ifreq 
 int cfg80211_wext_ioctl(struct ifreq *ifr, unsigned int cmd);
 #ifdef CFG80211_MODULE
 int call_cfg80211_wext_ioctl(struct ifreq *ifr, unsigned int cmd);
+#else
+#define call_cfg80211_wext_ioctl cfg80211_wext_ioctl
+#endif
+
+#ifdef CONFIG_CFG80211_WEXT_COMPAT
 int cfg80211_wext_init(void);
 void cfg80211_wext_exit(void);
 #else
-#define call_cfg80211_wext_ioctl cfg80211_wext_ioctl
 static inline int cfg80211_wext_init(void)
 {
 	return 0;
author maintainer
#1 lore raw

PATCH 1/1 fix cfg80211 modular compile w/o wext-compat

The static inlines that are supposed to be used w/o wext-compat to init wext-compat were done with the wrong #ifdef. This fixes it.

---
or rather, this fixes it.

net/wireless/wext.h +5 -1
@@ -29,10 +29,14 @@ int wireless_process_ioctl(struct ifreq 
 int cfg80211_wext_ioctl(struct ifreq *ifr, unsigned int cmd);
 #ifdef CFG80211_MODULE
 int call_cfg80211_wext_ioctl(struct ifreq *ifr, unsigned int cmd);
+#else
+#define call_cfg80211_wext_ioctl cfg80211_wext_ioctl
+#endif
+
+#if defined(CONFIG_CFG80211_WEXT_COMPAT) && defined(CFG80211_MODULE)
 int cfg80211_wext_init(void);
 void cfg80211_wext_exit(void);
 #else
-#define call_cfg80211_wext_ioctl cfg80211_wext_ioctl
 static inline int cfg80211_wext_init(void)
 {
 	return 0;