Commit d3c89bbc authored Aug 21, 2018 by Haim Dreyfuss Committed by Johannes Berg Aug 28, 2018

nl80211: Fix nla_put_u8 to u16 for NL80211_WMMR_TXOP



TXOP (also known as Channel Occupancy Time) is u16 and should be
added using nla_put_u16 instead of u8, fix that.

Fixes: 50f32718 ("nl80211: Add wmm rule attribute to NL80211_CMD_GET_WIPHY dump command")
Signed-off-by: Haim Dreyfuss <haim.dreyfuss@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 3a2af7cc

net/wireless/nl80211.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -672,7 +672,7 @@ static int nl80211_msg_put_wmm_rules(struct sk_buff *msg,
		rule->wmm_rule.client[j].cw_max) \|\|
		nla_put_u8(msg, NL80211_WMMR_AIFSN,
		rule->wmm_rule.client[j].aifsn) \|\|
		nla_put_u8(msg, NL80211_WMMR_TXOP,
		nla_put_u16(msg, NL80211_WMMR_TXOP,
		rule->wmm_rule.client[j].cot))
		goto nla_put_failure;

Admin message