84 lines
2.7 KiB
Diff
84 lines
2.7 KiB
Diff
|
From ae47d3756cfb9f55edac25fccbebe0a4bf1cbf1e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Johannes Berg <johannes.berg@intel.com>
|
||
|
|
Date: Wed, 27 Jan 2016 13:41:35 +0100
|
||
|
|
Subject: [PATCH 2/2] cfg80211/wext: fix message ordering
|
||
|
|
|
||
|
|
Since cfg80211 frequently takes actions from its netdev notifier
|
||
|
|
call, wireless extensions messages could still be ordered badly
|
||
|
|
since the wext netdev notifier, since wext is built into the
|
||
|
|
kernel, runs before the cfg80211 netdev notifier. For example,
|
||
|
|
the following can happen:
|
||
|
|
|
||
|
|
5: wlan1: <BROADCAST,MULTICAST> mtu 1500 qdisc mq state DOWN group default
|
||
|
|
link/ether 02:00:00:00:01:00 brd ff:ff:ff:ff:ff:ff
|
||
|
|
5: wlan1: <BROADCAST,MULTICAST,UP>
|
||
|
|
link/ether
|
||
|
|
|
||
|
|
when setting the interface down causes the wext message.
|
||
|
|
|
||
|
|
To also fix this, export the wireless_nlevent_flush() function
|
||
|
|
and also call it from the cfg80211 notifier.
|
||
|
|
|
||
|
|
Cc: stable@vger.kernel.org
|
||
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
||
|
|
---
|
||
|
|
include/net/iw_handler.h | 6 ++++++
|
||
|
|
net/wireless/core.c | 2 ++
|
||
|
|
net/wireless/wext-core.c | 3 ++-
|
||
|
|
3 files changed, 10 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/include/net/iw_handler.h b/include/net/iw_handler.h
|
||
|
|
index 8f81bbbc38fc..8a3ec3955f20 100644
|
||
|
|
--- a/include/net/iw_handler.h
|
||
|
|
+++ b/include/net/iw_handler.h
|
||
|
|
@@ -439,6 +439,12 @@ int dev_get_wireless_info(char *buffer, char **start, off_t offset, int length);
|
||
|
|
/* 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 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/core.c b/net/wireless/core.c
|
||
|
|
index 3893409dee95..335830eccb01 100644
|
||
|
|
--- a/net/wireless/core.c
|
||
|
|
+++ b/net/wireless/core.c
|
||
|
|
@@ -1143,6 +1143,8 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
|
||
|
|
return NOTIFY_DONE;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ wireless_nlevent_flush();
|
||
|
|
+
|
||
|
|
return NOTIFY_OK;
|
||
|
|
}
|
||
|
|
|
||
|
|
diff --git a/net/wireless/wext-core.c b/net/wireless/wext-core.c
|
||
|
|
index 5f429637efff..abdfcb5f3e48 100644
|
||
|
|
--- a/net/wireless/wext-core.c
|
||
|
|
+++ b/net/wireless/wext-core.c
|
||
|
|
@@ -342,7 +342,7 @@ static const int compat_event_type_size[] = {
|
||
|
|
|
||
|
|
/* IW event code */
|
||
|
|
|
||
|
|
-static void wireless_nlevent_flush(void)
|
||
|
|
+void wireless_nlevent_flush(void)
|
||
|
|
{
|
||
|
|
struct sk_buff *skb;
|
||
|
|
struct net *net;
|
||
|
|
@@ -355,6 +355,7 @@ static void wireless_nlevent_flush(void)
|
||
|
|
GFP_KERNEL);
|
||
|
|
}
|
||
|
|
}
|
||
|
|
+EXPORT_SYMBOL_GPL(wireless_nlevent_flush);
|
||
|
|
|
||
|
|
static int wext_netdev_notifier_call(struct notifier_block *nb,
|
||
|
|
unsigned long state, void *ptr)
|
||
|
|
--
|
||
|
|
2.5.0
|
||
|
|
|