summaryrefslogtreecommitdiffstats
path: root/cfg80211-wext-fix-message-ordering.patch
diff options
context:
space:
mode:
Diffstat (limited to 'cfg80211-wext-fix-message-ordering.patch')
-rw-r--r--cfg80211-wext-fix-message-ordering.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/cfg80211-wext-fix-message-ordering.patch b/cfg80211-wext-fix-message-ordering.patch
index e59d6d412..8d3cdfdda 100644
--- a/cfg80211-wext-fix-message-ordering.patch
+++ b/cfg80211-wext-fix-message-ordering.patch
@@ -1,7 +1,7 @@
-From ae47d3756cfb9f55edac25fccbebe0a4bf1cbf1e Mon Sep 17 00:00:00 2001
+From cb150b9d23be6ee7f3a0fff29784f1c5b5ac514d 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
+Date: Wed, 27 Jan 2016 13:29:34 +0100
+Subject: cfg80211/wext: fix message ordering
Since cfg80211 frequently takes actions from its netdev notifier
call, wireless extensions messages could still be ordered badly
@@ -28,7 +28,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
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
+index 8f81bbb..e0f4109 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);
@@ -39,16 +39,16 @@ index 8f81bbbc38fc..8a3ec3955f20 100644
+/* flush all previous wext events - if work is done from netdev notifiers */
+void wireless_nlevent_flush(void);
+#else
-+static void wireless_nlevent_flush(void) {}
++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/core.c b/net/wireless/core.c
-index 3893409dee95..335830eccb01 100644
+index b091551..8f0bac7 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,
+@@ -1147,6 +1147,8 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
return NOTIFY_DONE;
}
@@ -58,7 +58,7 @@ index 3893409dee95..335830eccb01 100644
}
diff --git a/net/wireless/wext-core.c b/net/wireless/wext-core.c
-index 5f429637efff..abdfcb5f3e48 100644
+index 87dd619..b50ee5d 100644
--- a/net/wireless/wext-core.c
+++ b/net/wireless/wext-core.c
@@ -342,7 +342,7 @@ static const int compat_event_type_size[] = {
@@ -79,5 +79,5 @@ index 5f429637efff..abdfcb5f3e48 100644
static int wext_netdev_notifier_call(struct notifier_block *nb,
unsigned long state, void *ptr)
--
-2.5.0
+cgit v0.12