1 files changed, 10 insertions, 1 deletions

diff --git a/drivers/net/wireless/mwifiex/uap_txrx.c b/drivers/net/wireless/mwifiex/uap_txrx.c
index ec7309d096ab..be3a203a529b 100644
--- a/drivers/net/wireless/mwifiex/uap_txrx.c
+++ b/drivers/net/wireless/mwifiex/uap_txrx.c
@@ -266,6 +266,7 @@ int mwifiex_process_uap_rx_packet(struct mwifiex_private *priv,
         struct rx_packet_hdr *rx_pkt_hdr;
         u16 rx_pkt_type;
         u8 ta[ETH_ALEN], pkt_type;
+        unsigned long flags;
         struct mwifiex_sta_node *node;
 
         uap_rx_pd = (struct uap_rxpd *)(skb->data);
@@ -294,10 +295,12 @@ int mwifiex_process_uap_rx_packet(struct mwifiex_private *priv,
         memcpy(ta, rx_pkt_hdr->eth803_hdr.h_source, ETH_ALEN);
 
         if (rx_pkt_type != PKT_TYPE_BAR && uap_rx_pd->priority < MAX_NUM_TID) {
+                spin_lock_irqsave(&priv->sta_list_spinlock, flags);
                 node = mwifiex_get_sta_entry(priv, ta);
                 if (node)
                         node->rx_seq[uap_rx_pd->priority] =
                                                 le16_to_cpu(uap_rx_pd->seq_num);
+                spin_unlock_irqrestore(&priv->sta_list_spinlock, flags);
         }
 
         if (!priv->ap_11n_enabled ||
@@ -370,10 +373,16 @@ void *mwifiex_process_uap_txpd(struct mwifiex_private *priv,
         txpd->bss_num = priv->bss_num;
         txpd->bss_type = priv->bss_type;
         txpd->tx_pkt_length = cpu_to_le16((u16)(skb->len - len));
-
         txpd->priority = (u8)skb->priority;
+
         txpd->pkt_delay_2ms = mwifiex_wmm_compute_drv_pkt_delay(priv, skb);
 
+        if (tx_info->flags & MWIFIEX_BUF_FLAG_EAPOL_TX_STATUS ||
+            tx_info->flags & MWIFIEX_BUF_FLAG_ACTION_TX_STATUS) {
+                txpd->tx_token_id = tx_info->ack_frame_id;
+                txpd->flags |= MWIFIEX_TXPD_FLAGS_REQ_TX_STATUS;
+        }
+
         if (txpd->priority < ARRAY_SIZE(priv->wmm.user_pri_pkt_tx_ctrl))
                 /*
                  * Set the priority specific tx_control field, setting of 0 will