Revert "wifi: cfg80211: unexport wireless_nlevent_flush()"

Revert this, I neglected to take into account the fact that
cfg80211 itself can be a module, but wext is always builtin.

Fixes: aee809aaa2d1 ("wifi: cfg80211: unexport wireless_nlevent_flush()")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/include/net/iw_handler.h b/include/net/iw_handler.h
index c9b46b99619747984061d58d822f09580ecc9c98..b80e474cb0aa92d3388c2f91c1b364274641d7ea 100644 (file)
--- a/include/net/iw_handler.h
+++ b/include/net/iw_handler.h
@@ -410,6 +410,12 @@ struct iw_spy_data {
 /* Send a single event to user space */
 void wireless_send_event(struct net_device *dev, unsigned int cmd,
                         union iwreq_data *wrqu, const char *extra);
+#ifdef CONFIG_WEXT_CORE
+/* flush all previous wext events - if work is done from netdev notifiers */
+void wireless_nlevent_flush(void);
+#else
+static inline void wireless_nlevent_flush(void) {}
+#endif
 
 /* We may need a function to send a stream of events to user space.
  * More on that later... */

diff --git a/net/wireless/wext-compat.h b/net/wireless/wext-compat.h
index f680dd134582998fbc4f6dd21126785e3652dbbb..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_WEXT_CORE
-void wireless_nlevent_flush(void);
-#else
-static inline void wireless_nlevent_flush(void) {}
-#endif
-
 int cfg80211_ibss_wext_siwfreq(struct net_device *dev,
                               struct iw_request_info *info,
                               struct iw_freq *wextfreq, char *extra);

diff --git a/net/wireless/wext-core.c b/net/wireless/wext-core.c
index 00c640b3e86e6921f6745a410eb0429ad636420a..3bb04b05c5cea79a83904198a7db4411f69aea4e 100644 (file)
--- a/net/wireless/wext-core.c
+++ b/net/wireless/wext-core.c
@@ -20,7 +20,6 @@
 #include <net/netlink.h>
 #include <net/wext.h>
 #include <net/net_namespace.h>
-#include "wext-compat.h"
 
 typedef int (*wext_ioctl_func)(struct net_device *, struct iwreq *,
                               unsigned int, struct iw_request_info *,
@@ -357,6 +356,7 @@ void wireless_nlevent_flush(void)
        }
        up_read(&net_rwsem);
 }
+EXPORT_SYMBOL_GPL(wireless_nlevent_flush);
 
 static int wext_netdev_notifier_call(struct notifier_block *nb,
                                     unsigned long state, void *ptr)