aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHaim Dreyfuss <haim.dreyfuss@intel.com>2018-08-21 02:22:19 -0400
committerJohannes Berg <johannes.berg@intel.com>2018-08-28 05:37:28 -0400
commitd3c89bbc7491d5e288ca2993e999d24ba9ff52ad (patch)
treeabca211f0ee3272eb039b79cb123745332e16d60
parent3a2af7cccbbaf2362db9053a946a6084e12bfa73 (diff)
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: 50f32718e125 ("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>
-rw-r--r--net/wireless/nl80211.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index e3dcffd96919..3f7ffbe6c634 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -672,8 +672,8 @@ static int nl80211_msg_put_wmm_rules(struct sk_buff *msg,
672 rule->wmm_rule.client[j].cw_max) || 672 rule->wmm_rule.client[j].cw_max) ||
673 nla_put_u8(msg, NL80211_WMMR_AIFSN, 673 nla_put_u8(msg, NL80211_WMMR_AIFSN,
674 rule->wmm_rule.client[j].aifsn) || 674 rule->wmm_rule.client[j].aifsn) ||
675 nla_put_u8(msg, NL80211_WMMR_TXOP, 675 nla_put_u16(msg, NL80211_WMMR_TXOP,
676 rule->wmm_rule.client[j].cot)) 676 rule->wmm_rule.client[j].cot))
677 goto nla_put_failure; 677 goto nla_put_failure;
678 678
679 nla_nest_end(msg, nl_wmm_rule); 679 nla_nest_end(msg, nl_wmm_rule);