4.9-stable patches

added patches:
	mac80211-fix-addition-of-mesh-configuration-element.patch

diff --git a/queue-4.9/mac80211-fix-addition-of-mesh-configuration-element.patch b/queue-4.9/mac80211-fix-addition-of-mesh-configuration-element.patch
new file mode 100644 (file)
index 0000000..3d8a5bf
--- /dev/null
+++ b/queue-4.9/mac80211-fix-addition-of-mesh-configuration-element.patch
@@ -0,0 +1,38 @@
+From 57629915d568c522ac1422df7bba4bee5b5c7a7c Mon Sep 17 00:00:00 2001
+From: Ilan peer <ilan.peer@intel.com>
+Date: Mon, 26 Dec 2016 18:17:36 +0200
+Subject: mac80211: Fix addition of mesh configuration element
+
+From: Ilan peer <ilan.peer@intel.com>
+
+commit 57629915d568c522ac1422df7bba4bee5b5c7a7c upstream.
+
+The code was setting the capabilities byte to zero,
+after it was already properly set previously. Fix it.
+
+The bug was found while debugging hwsim mesh tests failures
+that happened since the commit mentioned below.
+
+Fixes: 76f43b4c0a93 ("mac80211: Remove invalid flag operations in mesh TSF synchronization")
+Signed-off-by: Ilan Peer <ilan.peer@intel.com>
+Reviewed-by: Masashi Honma <masashi.honma@gmail.com>
+Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+Cc: Richard Schütz <rschuetz@uni-koblenz.de>
+Cc: Mathias Kretschmer <mathias.kretschmer@fit.fraunhofer.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ net/mac80211/mesh.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/net/mac80211/mesh.c
++++ b/net/mac80211/mesh.c
+@@ -279,8 +279,6 @@ int mesh_add_meshconf_ie(struct ieee8021
+       /* Mesh PS mode. See IEEE802.11-2012 8.4.2.100.8 */
+       *pos |= ifmsh->ps_peers_deep_sleep ?
+                       IEEE80211_MESHCONF_CAPAB_POWER_SAVE_LEVEL : 0x00;
+-      *pos++ = 0x00;
+-
+       return 0;
+ }
+ 

diff --git a/queue-4.9/series b/queue-4.9/series
index 6295f860144d06bc22146ebbdc849323d146acc1..4b04d105015f0af18f2125ae460268f68d13f4c4 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -19,3 +19,4 @@ eeprom-at24-change-nvmem-stride-to-1.patch
 dmaengine-dmatest-move-callback-wait-queue-to-thread-context.patch
 ext4-fix-fdatasync-2-after-fallocate-2-operation.patch
 ext4-fix-crash-when-a-directory-s-i_size-is-too-small.patch
+mac80211-fix-addition-of-mesh-configuration-element.patch