lkml.org 
[lkml]   [2013]   [Nov]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 12/74] mac80211: use sta_info_get_bss() for nl80211 tx and client probing
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Felix Fietkau <nbd@openwrt.org>

    commit 03bb7f42765ce596604f03d179f3137d7df05bba upstream.

    This allows calls for clients in AP_VLANs (e.g. for 4-addr) to succeed

    Signed-off-by: Felix Fietkau <nbd@openwrt.org>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    net/mac80211/cfg.c | 2 +-
    net/mac80211/tx.c | 3 ++-
    2 files changed, 3 insertions(+), 2 deletions(-)

    --- a/net/mac80211/cfg.c
    +++ b/net/mac80211/cfg.c
    @@ -3315,7 +3315,7 @@ static int ieee80211_probe_client(struct
    return -EINVAL;
    }
    band = chanctx_conf->def.chan->band;
    - sta = sta_info_get(sdata, peer);
    + sta = sta_info_get_bss(sdata, peer);
    if (sta) {
    qos = test_sta_flag(sta, WLAN_STA_WME);
    } else {
    --- a/net/mac80211/tx.c
    +++ b/net/mac80211/tx.c
    @@ -1100,7 +1100,8 @@ ieee80211_tx_prepare(struct ieee80211_su
    tx->sta = rcu_dereference(sdata->u.vlan.sta);
    if (!tx->sta && sdata->dev->ieee80211_ptr->use_4addr)
    return TX_DROP;
    - } else if (info->flags & IEEE80211_TX_CTL_INJECTED ||
    + } else if (info->flags & (IEEE80211_TX_CTL_INJECTED |
    + IEEE80211_TX_INTFL_NL80211_FRAME_TX) ||
    tx->sdata->control_port_protocol == tx->skb->protocol) {
    tx->sta = sta_info_get_bss(sdata, hdr->addr1);
    }



    \
     
     \ /
      Last update: 2013-11-09 10:21    [W:4.157 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site