]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
mac80211: Fix addition of mesh configuration element
authorIlan peer <ilan.peer@intel.com>
Mon, 26 Dec 2016 16:17:36 +0000 (18:17 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 2 Jan 2017 10:58:26 +0000 (11:58 +0100)
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>
net/mac80211/mesh.c

index cc2a63bd233f5f12ea21312ae49be0d3fd0f9d3a..9c23172feba07abd63d7fdf2ab1530cbca28b8b9 100644 (file)
@@ -279,8 +279,6 @@ int mesh_add_meshconf_ie(struct ieee80211_sub_if_data *sdata,
        /* 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;
 }