| From fd551bac4795854adaa87bad7e5136083719802b Mon Sep 17 00:00:00 2001 |
| From: Masashi Honma <masashi.honma@gmail.com> |
| Date: Thu, 26 Jan 2017 08:56:13 +0900 |
| Subject: [PATCH] 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 <masashi.honma@gmail.com> |
| [rewrite commit message to use Fixes: line] |
| Signed-off-by: Johannes Berg <johannes.berg@intel.com> |
| |
| diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c |
| index 5c1b267e22be..aee396b9f190 100644 |
| --- a/net/wireless/nl80211.c |
| +++ b/net/wireless/nl80211.c |
| @@ -5916,6 +5916,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, |
| -- |
| 2.12.0 |
| |
