2017-01-25 23:56:25

by Masashi Honma

[permalink] [raw]
Subject: [PATCH] nl80211: Fix mesh HT operation check

commit 9757235f451c27deaa88925399f070ff6fcea832 ('nl80211: correct
checks for NL80211_MESHCONF_HT_OPMODE value') missed to mask a flag
when replacing FILL_IN_MESH_PARAM_IF_SET with checking codes. This
could drop the received HT operation value when called by
nl80211_update_mesh_config().

Signed-off-by: Masashi Honma <[email protected]>
---
net/wireless/nl80211.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index e6ed8dc..006c147 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -5924,6 +5924,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.7.4


2017-02-06 07:00:51

by Johannes Berg

[permalink] [raw]
Subject: Re: [PATCH] nl80211: Fix mesh HT operation check

On Thu, 2017-01-26 at 08:56 +0900, Masashi Honma wrote:
> commit 9757235f451c27deaa88925399f070ff6fcea832 ('nl80211: correct
> checks for NL80211_MESHCONF_HT_OPMODE value') missed to mask a flag
> when replacing FILL_IN_MESH_PARAM_IF_SET with checking codes. This
> could drop the received HT operation value when called by
> nl80211_update_mesh_config().

Applied, thanks.

johannes