summaryrefslogtreecommitdiff
path: root/net/mac80211
diff options
context:
space:
mode:
authorIlan peer <ilan.peer@intel.com>2016-12-26 19:17:36 +0300
committerJohannes Berg <johannes.berg@intel.com>2017-01-02 13:58:26 +0300
commit57629915d568c522ac1422df7bba4bee5b5c7a7c (patch)
tree24aa5732c929d89e6ad3ec9af1c9143904db98d0 /net/mac80211
parent7b854982b273134e4ff02c61a74e70e1b1876286 (diff)
downloadlinux-57629915d568c522ac1422df7bba4bee5b5c7a7c.tar.xz
mac80211: Fix addition of mesh configuration element
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>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/mesh.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index cc2a63bd233f..9c23172feba0 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -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;
}