lkml.org 
[lkml]   [2018]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.18 18/76] nl80211: Fix nla_put_u8 to u16 for NL80211_WMMR_TXOP
    Date
    From: Haim Dreyfuss <haim.dreyfuss@intel.com>

    [ Upstream commit d3c89bbc7491d5e288ca2993e999d24ba9ff52ad ]

    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>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    net/wireless/nl80211.c | 4 ++--
    1 file 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,
    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,
    - rule->wmm_rule.client[j].cot))
    + nla_put_u16(msg, NL80211_WMMR_TXOP,
    + rule->wmm_rule.client[j].cot))
    goto nla_put_failure;

    nla_nest_end(msg, nl_wmm_rule);
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-09-24 17:12    [W:4.959 / U:0.176 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site