1 files changed, 14 insertions, 2 deletions

diff --git a/drivers/net/wireless/mwifiex/sta_rx.c b/drivers/net/wireless/mwifiex/sta_rx.c
index ed26387eccf5..8b639d7fe6df 100644
--- a/drivers/net/wireless/mwifiex/sta_rx.c
+++ b/drivers/net/wireless/mwifiex/sta_rx.c
@@ -183,6 +183,7 @@ int mwifiex_process_sta_rx_packet(struct mwifiex_private *priv,
         struct rx_packet_hdr *rx_pkt_hdr;
         u8 ta[ETH_ALEN];
         u16 rx_pkt_type, rx_pkt_offset, rx_pkt_length, seq_num;
+        struct mwifiex_sta_node *sta_ptr;
 
         local_rx_pd = (struct rxpd *) (skb->data);
         rx_pkt_type = le16_to_cpu(local_rx_pd->rx_pkt_type);
@@ -213,14 +214,25 @@ int mwifiex_process_sta_rx_packet(struct mwifiex_private *priv,
          * If the packet is not an unicast packet then send the packet
          * directly to os. Don't pass thru rx reordering
          */
-        if (!IS_11N_ENABLED(priv) ||
+        if ((!IS_11N_ENABLED(priv) &&
+             !(ISSUPP_TDLS_ENABLED(priv->adapter->fw_cap_info) &&
+               !(local_rx_pd->flags & MWIFIEX_RXPD_FLAGS_TDLS_PACKET))) ||
             !ether_addr_equal_unaligned(priv->curr_addr, rx_pkt_hdr->eth803_hdr.h_dest)) {
                 mwifiex_process_rx_packet(priv, skb);
                 return ret;
         }
 
-        if (mwifiex_queuing_ra_based(priv)) {
+        if (mwifiex_queuing_ra_based(priv) ||
+            (ISSUPP_TDLS_ENABLED(priv->adapter->fw_cap_info) &&
+             local_rx_pd->flags & MWIFIEX_RXPD_FLAGS_TDLS_PACKET)) {
                 memcpy(ta, rx_pkt_hdr->eth803_hdr.h_source, ETH_ALEN);
+                if (local_rx_pd->flags & MWIFIEX_RXPD_FLAGS_TDLS_PACKET &&
+                    local_rx_pd->priority < MAX_NUM_TID) {
+                        sta_ptr = mwifiex_get_sta_entry(priv, ta);
+                        if (sta_ptr)
+                                sta_ptr->rx_seq[local_rx_pd->priority] =
+                                              le16_to_cpu(local_rx_pd->seq_num);
+                }
         } else {
                 if (rx_pkt_type != PKT_TYPE_BAR)
                         priv->rx_seq[local_rx_pd->priority] = seq_num;