This is a note to let you know that I've just added the patch titled

mac80211: Fix addition of mesh configuration element

to the 3.18-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git%3Ba=su...

The filename of the patch is: mac80211-fix-addition-of-mesh-configuration-element.patch and it can be found in the queue-3.18 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let stable@vger.kernel.org know about it.

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 @@ -289,8 +289,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; }

Patches currently in stable-queue which might be from ilan.peer@intel.com are

queue-3.18/mac80211-fix-addition-of-mesh-configuration-element.patch