summaryrefslogtreecommitdiffstats
path: root/wext-fix-message-delay-ordering.patch
diff options
context:
space:
mode:
Diffstat (limited to 'wext-fix-message-delay-ordering.patch')
-rw-r--r--wext-fix-message-delay-ordering.patch22
1 files changed, 12 insertions, 10 deletions
diff --git a/wext-fix-message-delay-ordering.patch b/wext-fix-message-delay-ordering.patch
index 84bd532eb..109b68da3 100644
--- a/wext-fix-message-delay-ordering.patch
+++ b/wext-fix-message-delay-ordering.patch
@@ -1,7 +1,7 @@
-From 699a8adb3553e2a7fb5930e1f962e2ef6d6f4104 Mon Sep 17 00:00:00 2001
+From 8bf862739a7786ae72409220914df960a0aa80d8 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
-Date: Wed, 27 Jan 2016 13:41:34 +0100
-Subject: [PATCH 1/2] wext: fix message delay/ordering
+Date: Wed, 27 Jan 2016 12:37:52 +0100
+Subject: wext: fix message delay/ordering
Beniamino reported that he was getting an RTM_NEWLINK message for a
given interface, after the RTM_DELLINK for it. It turns out that the
@@ -37,11 +37,11 @@ Cc: stable@vger.kernel.org
Reported-by: Beniamino Galvani <bgalvani@redhat.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
- net/wireless/wext-core.c | 49 ++++++++++++++++++++++++++++++++++++++----------
- 1 file changed, 39 insertions(+), 10 deletions(-)
+ net/wireless/wext-core.c | 51 +++++++++++++++++++++++++++++++++++++-----------
+ 1 file changed, 40 insertions(+), 11 deletions(-)
diff --git a/net/wireless/wext-core.c b/net/wireless/wext-core.c
-index c8717c1d082e..5f429637efff 100644
+index c8717c1..87dd619 100644
--- a/net/wireless/wext-core.c
+++ b/net/wireless/wext-core.c
@@ -342,6 +342,39 @@ static const int compat_event_type_size[] = {
@@ -84,18 +84,20 @@ index c8717c1d082e..5f429637efff 100644
static int __net_init wext_pernet_init(struct net *net)
{
skb_queue_head_init(&net->wext_nlevents);
-@@ -360,6 +393,11 @@ static struct pernet_operations wext_pernet_ops = {
+@@ -360,7 +393,12 @@ static struct pernet_operations wext_pernet_ops = {
static int __init wireless_nlevent_init(void)
{
-+ int err = register_netdevice_notifier(&wext_netdev_notifier);
+- return register_pernet_subsys(&wext_pernet_ops);
++ int err = register_pernet_subsys(&wext_pernet_ops);
+
+ if (err)
+ return err;
+
- return register_pernet_subsys(&wext_pernet_ops);
++ return register_netdevice_notifier(&wext_netdev_notifier);
}
+ subsys_initcall(wireless_nlevent_init);
@@ -368,17 +406,8 @@ subsys_initcall(wireless_nlevent_init);
/* Process events generated by the wireless layer or the driver. */
static void wireless_nlevent_process(struct work_struct *work)
@@ -116,5 +118,5 @@ index c8717c1d082e..5f429637efff 100644
}
--
-2.5.0
+cgit v0.12