lkml.org 
[lkml]   [2020]   [Mar]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 123/155] mac80211: set IEEE80211_TX_CTRL_PORT_CTRL_PROTO for nl80211 TX
    Date
    From: Johannes Berg <johannes.berg@intel.com>

    commit b95d2ccd2ccb834394d50347d0e40dc38a954e4a upstream.

    When a frame is transmitted via the nl80211 TX rather than as a
    normal frame, IEEE80211_TX_CTRL_PORT_CTRL_PROTO wasn't set and
    this will lead to wrong decisions (rate control etc.) being made
    about the frame; fix this.

    Fixes: 911806491425 ("mac80211: Add support for tx_control_port")
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Link: https://lore.kernel.org/r/20200326155333.f183f52b02f0.I4054e2a8c11c2ddcb795a0103c87be3538690243@changeid
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    net/mac80211/tx.c | 8 ++++++--
    1 file changed, 6 insertions(+), 2 deletions(-)

    --- a/net/mac80211/tx.c
    +++ b/net/mac80211/tx.c
    @@ -5,7 +5,7 @@
    * Copyright 2006-2007 Jiri Benc <jbenc@suse.cz>
    * Copyright 2007 Johannes Berg <johannes@sipsolutions.net>
    * Copyright 2013-2014 Intel Mobile Communications GmbH
    - * Copyright (C) 2018 Intel Corporation
    + * Copyright (C) 2018, 2020 Intel Corporation
    *
    * Transmit and frame generation functions.
    */
    @@ -5067,6 +5067,7 @@ int ieee80211_tx_control_port(struct wip
    struct ieee80211_local *local = sdata->local;
    struct sk_buff *skb;
    struct ethhdr *ehdr;
    + u32 ctrl_flags = 0;
    u32 flags;

    /* Only accept CONTROL_PORT_PROTOCOL configured in CONNECT/ASSOCIATE
    @@ -5076,6 +5077,9 @@ int ieee80211_tx_control_port(struct wip
    proto != cpu_to_be16(ETH_P_PREAUTH))
    return -EINVAL;

    + if (proto == sdata->control_port_protocol)
    + ctrl_flags |= IEEE80211_TX_CTRL_PORT_CTRL_PROTO;
    +
    if (unencrypted)
    flags = IEEE80211_TX_INTFL_DONT_ENCRYPT;
    else
    @@ -5101,7 +5105,7 @@ int ieee80211_tx_control_port(struct wip
    skb_reset_mac_header(skb);

    local_bh_disable();
    - __ieee80211_subif_start_xmit(skb, skb->dev, flags, 0);
    + __ieee80211_subif_start_xmit(skb, skb->dev, flags, ctrl_flags);
    local_bh_enable();

    return 0;

    \
     
     \ /
      Last update: 2020-03-31 11:17    [W:4.059 / U:0.168 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site