nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

Revert "wifi: cfg80211: unexport wireless_nlevent_flush()"

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

Fixes: aee809aaa2 ("wifi: cfg80211: unexport wireless_nlevent_flush()")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2024-10-09 08:33:05 +02:00
parent ff919efb5f
commit db03488897
3 changed files with 7 additions and 7 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

6
include/net/iw_handler.h
View file

@ -410,6 +410,12 @@ struct iw_spy_data {
/* Send a single event to user space */ /* Send a single event to user space */
void wireless_send_event(struct net_device *dev, unsigned int cmd, void wireless_send_event(struct net_device *dev, unsigned int cmd,
union iwreq_data *wrqu, const char *extra); 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. /* We may need a function to send a stream of events to user space.
* More on that later... */ * More on that later... */

6
net/wireless/wext-compat.h
View file

@ -5,12 +5,6 @@
#include <net/iw_handler.h> #include <net/iw_handler.h>
#include <linux/wireless.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, int cfg80211_ibss_wext_siwfreq(struct net_device *dev,
struct iw_request_info *info, struct iw_request_info *info,
struct iw_freq *wextfreq, char *extra); struct iw_freq *wextfreq, char *extra);

2
net/wireless/wext-core.c
View file

@ -20,7 +20,6 @@
#include <net/netlink.h> #include <net/netlink.h>
#include <net/wext.h> #include <net/wext.h>
#include <net/net_namespace.h> #include <net/net_namespace.h>
#include "wext-compat.h"
typedef int (*wext_ioctl_func)(struct net_device *, struct iwreq *, typedef int (*wext_ioctl_func)(struct net_device *, struct iwreq *,
unsigned int, struct iw_request_info *, unsigned int, struct iw_request_info *,
@ -357,6 +356,7 @@ void wireless_nlevent_flush(void)
} }
up_read(&net_rwsem); up_read(&net_rwsem);
} }
EXPORT_SYMBOL_GPL(wireless_nlevent_flush);
static int wext_netdev_notifier_call(struct notifier_block *nb, static int wext_netdev_notifier_call(struct notifier_block *nb,
unsigned long state, void *ptr) unsigned long state, void *ptr)