Linux wireless drivers development
 help / color / mirror / Atom feed
* [PATCH] fix cfg80211 modular compile w/o wext-compat
@ 2007-02-16 20:56 Johannes Berg
  2007-02-17  0:47 ` Johannes Berg
  0 siblings, 1 reply; 2+ messages in thread
From: Johannes Berg @ 2007-02-16 20:56 UTC (permalink / raw)
  To: linux-wireless; +Cc: James Ketrenos, John W. Linville

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.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>

--- wireless-dev.orig/net/wireless/wext.h	2007-02-16 21:51:26.354695664 +0100
+++ wireless-dev/net/wireless/wext.h	2007-02-16 21:55:32.794695664 +0100
@@ -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;



^ permalink raw reply	[flat|nested] 2+ messages in thread

* [PATCH] fix cfg80211 modular compile w/o wext-compat
  2007-02-16 20:56 [PATCH] fix cfg80211 modular compile w/o wext-compat Johannes Berg
@ 2007-02-17  0:47 ` Johannes Berg
  0 siblings, 0 replies; 2+ messages in thread
From: Johannes Berg @ 2007-02-17  0:47 UTC (permalink / raw)
  To: linux-wireless; +Cc: James Ketrenos, John W. Linville

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.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>

---
or rather, this fixes it.

--- wireless-dev.orig/net/wireless/wext.h	2007-02-16 21:51:26.354695664 +0100
+++ wireless-dev/net/wireless/wext.h	2007-02-17 01:46:34.514695664 +0100
@@ -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;



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2007-02-17  0:47 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-02-16 20:56 [PATCH] fix cfg80211 modular compile w/o wext-compat Johannes Berg
2007-02-17  0:47 ` Johannes Berg

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox