lkml.org 
[lkml]   [2018]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 206/496] iwlwifi: mvm: Direct multicast frames to the correct station
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

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

    From: Ilan Peer <ilan.peer@intel.com>

    [ Upstream commit 7c305de2b9548ab6b65fce342c78618bbed5db73 ]

    Multicast frames for NL80211_IFTYPE_AP and NL80211_IFTYPE_ADHOC were
    directed to the broadcast station, however, as the broadcast station
    did not have keys configured, these frames were sent unencrypted.

    Fix this by using the multicast station which is the station for which
    encryption keys are configured.

    Signed-off-by: Ilan Peer <ilan.peer@intel.com>
    Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    --- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
    +++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
    @@ -648,7 +648,11 @@ int iwl_mvm_tx_skb_non_sta(struct iwl_mv
    if (info.control.vif->type == NL80211_IFTYPE_P2P_DEVICE ||
    info.control.vif->type == NL80211_IFTYPE_AP ||
    info.control.vif->type == NL80211_IFTYPE_ADHOC) {
    - sta_id = mvmvif->bcast_sta.sta_id;
    + if (info.control.vif->type == NL80211_IFTYPE_P2P_DEVICE)
    + sta_id = mvmvif->bcast_sta.sta_id;
    + else
    + sta_id = mvmvif->mcast_sta.sta_id;
    +
    queue = iwl_mvm_get_ctrl_vif_queue(mvm, &info,
    hdr->frame_control);
    if (queue < 0)

    \
     
     \ /
      Last update: 2018-05-28 15:15    [W:4.183 / U:0.964 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site