cfg80211: let ieee80211_amsdu_to_8023s() take only header-less SKB

[cascardo/linux.git] / drivers / net / wireless / marvell / mwifiex / 11n_rxreorder.c

diff --git a/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c b/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c
index a74cc43..e9f462e 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c
+++ b/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c
@@ -45,7 +45,7 @@ static int mwifiex_11n_dispatch_amsdu_pkt(struct mwifiex_private *priv,
                skb_trim(skb, le16_to_cpu(local_rx_pd->rx_pkt_length));
 
                ieee80211_amsdu_to_8023s(skb, &list, priv->curr_addr,
-                                        priv->wdev.iftype, 0, false);
+                                        priv->wdev.iftype, 0);
 
                while (!skb_queue_empty(&list)) {
                        struct rx_packet_hdr *rx_hdr;
@@ -78,8 +78,15 @@ static int mwifiex_11n_dispatch_amsdu_pkt(struct mwifiex_private *priv,
  */
 static int mwifiex_11n_dispatch_pkt(struct mwifiex_private *priv, void *payload)
 {
-       int ret = mwifiex_11n_dispatch_amsdu_pkt(priv, payload);
 
+       int ret;
+
+       if (!payload) {
+               mwifiex_dbg(priv->adapter, INFO, "info: fw drop data\n");
+               return 0;
+       }
+
+       ret = mwifiex_11n_dispatch_amsdu_pkt(priv, payload);
        if (!ret)
                return 0;
 
@@ -921,3 +928,72 @@ void mwifiex_coex_ampdu_rxwinsize(struct mwifiex_adapter *adapter)
        else
                mwifiex_update_ampdu_rxwinsize(adapter, false);
 }
+
+/* This function handles rxba_sync event
+ */
+void mwifiex_11n_rxba_sync_event(struct mwifiex_private *priv,
+                                u8 *event_buf, u16 len)
+{
+       struct mwifiex_ie_types_rxba_sync *tlv_rxba = (void *)event_buf;
+       u16 tlv_type, tlv_len;
+       struct mwifiex_rx_reorder_tbl *rx_reor_tbl_ptr;
+       u8 i, j;
+       u16 seq_num, tlv_seq_num, tlv_bitmap_len;
+       int tlv_buf_left = len;
+       int ret;
+       u8 *tmp;
+
+       mwifiex_dbg_dump(priv->adapter, EVT_D, "RXBA_SYNC event:",
+                        event_buf, len);
+       while (tlv_buf_left >= sizeof(*tlv_rxba)) {
+               tlv_type = le16_to_cpu(tlv_rxba->header.type);
+               tlv_len  = le16_to_cpu(tlv_rxba->header.len);
+               if (tlv_type != TLV_TYPE_RXBA_SYNC) {
+                       mwifiex_dbg(priv->adapter, ERROR,
+                                   "Wrong TLV id=0x%x\n", tlv_type);
+                       return;
+               }
+
+               tlv_seq_num = le16_to_cpu(tlv_rxba->seq_num);
+               tlv_bitmap_len = le16_to_cpu(tlv_rxba->bitmap_len);
+               mwifiex_dbg(priv->adapter, INFO,
+                           "%pM tid=%d seq_num=%d bitmap_len=%d\n",
+                           tlv_rxba->mac, tlv_rxba->tid, tlv_seq_num,
+                           tlv_bitmap_len);
+
+               rx_reor_tbl_ptr =
+                       mwifiex_11n_get_rx_reorder_tbl(priv, tlv_rxba->tid,
+                                                      tlv_rxba->mac);
+               if (!rx_reor_tbl_ptr) {
+                       mwifiex_dbg(priv->adapter, ERROR,
+                                   "Can not find rx_reorder_tbl!");
+                       return;
+               }
+
+               for (i = 0; i < tlv_bitmap_len; i++) {
+                       for (j = 0 ; j < 8; j++) {
+                               if (tlv_rxba->bitmap[i] & (1 << j)) {
+                                       seq_num = (MAX_TID_VALUE - 1) &
+                                               (tlv_seq_num + i * 8 + j);
+
+                                       mwifiex_dbg(priv->adapter, ERROR,
+                                                   "drop packet,seq=%d\n",
+                                                   seq_num);
+
+                                       ret = mwifiex_11n_rx_reorder_pkt
+                                       (priv, seq_num, tlv_rxba->tid,
+                                        tlv_rxba->mac, 0, NULL);
+
+                                       if (ret)
+                                               mwifiex_dbg(priv->adapter,
+                                                           ERROR,
+                                                           "Fail to drop packet");
+                               }
+                       }
+               }
+
+               tlv_buf_left -= (sizeof(*tlv_rxba) + tlv_len);
+               tmp = (u8 *)tlv_rxba + tlv_len + sizeof(*tlv_rxba);
+               tlv_rxba = (struct mwifiex_ie_types_rxba_sync *)tmp;
+       }
+}