From: Masashi Honma Date: Wed, 25 Jan 2017 23:56:13 +0000 (+0900) Subject: nl80211: Fix mesh HT operation check X-Git-Tag: v4.9.10~28 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f9bd791be5b8755746528df95885a2b4a25b6ff6;p=thirdparty%2Fkernel%2Fstable.git nl80211: Fix mesh HT operation check commit fd551bac4795854adaa87bad7e5136083719802b upstream. A previous change to fix checks for NL80211_MESHCONF_HT_OPMODE missed setting the flag when replacing FILL_IN_MESH_PARAM_IF_SET with checking codes. This results in dropping the received HT operation value when called by nl80211_update_mesh_config(). Fix this by setting the flag properly. Fixes: 9757235f451c ("nl80211: correct checks for NL80211_MESHCONF_HT_OPMODE value") Signed-off-by: Masashi Honma [rewrite commit message to use Fixes: line] Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman --- diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 1b3c18c2c1ec4..cd7a419faa210 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -5874,6 +5874,7 @@ do { \ break; } cfg->ht_opmode = ht_opmode; + mask |= (1 << (NL80211_MESHCONF_HT_OPMODE - 1)); } FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMPactivePathToRootTimeout, 1, 65535, mask,