Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git

[linux-block.git] / drivers / net / wireless / ath / ath11k / mac.c

diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index 6d83a178a8915873e1940db06415238856a67c93..6426a38f8961aa7eed526868e779840a15fbfc7e 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -2084,7 +2084,7 @@ static void ath11k_peer_assoc_h_he(struct ath11k *ar,
        struct cfg80211_chan_def def;
        const struct ieee80211_sta_he_cap *he_cap = &sta->deflink.he_cap;
        enum nl80211_band band;
-       u16 *he_mcs_mask;
+       u16 he_mcs_mask[NL80211_HE_NSS_MAX];
        u8 max_nss, he_mcs;
        u16 he_tx_mcs = 0, v = 0;
        int i, he_nss, nss_idx;
@@ -2101,7 +2101,8 @@ static void ath11k_peer_assoc_h_he(struct ath11k *ar,
                return;
 
        band = def.chan->band;
-       he_mcs_mask = arvif->bitrate_mask.control[band].he_mcs;
+       memcpy(he_mcs_mask, arvif->bitrate_mask.control[band].he_mcs,
+              sizeof(he_mcs_mask));
 
        if (ath11k_peer_assoc_h_he_masked(he_mcs_mask))
                return;
@@ -8619,6 +8620,7 @@ err_fallback:
 
 static const struct ieee80211_ops ath11k_ops = {
        .tx                             = ath11k_mac_op_tx,
+       .wake_tx_queue                  = ieee80211_handle_wake_tx_queue,
        .start                          = ath11k_mac_op_start,
        .stop                           = ath11k_mac_op_stop,
        .reconfig_complete              = ath11k_mac_op_reconfig_complete,