mwifiex: add SDIO rx single port aggregation

[deliverable/linux.git] / drivers / net / wireless / mwifiex / main.c

diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c
index b242c3e8df3fe3dbb8785ee76179f80a22b14be2..eaaacecbdef65a1b1e1e45e7b86126194d251990 100644 (file)
--- a/drivers/net/wireless/mwifiex/main.c
+++ b/drivers/net/wireless/mwifiex/main.c
@@ -163,6 +163,7 @@ static int mwifiex_process_rx(struct mwifiex_adapter *adapter)
 {
        unsigned long flags;
        struct sk_buff *skb;
+       struct mwifiex_rxinfo *rx_info;
 
        spin_lock_irqsave(&adapter->rx_proc_lock, flags);
        if (adapter->rx_processing || adapter->rx_locked) {
@@ -184,7 +185,14 @@ static int mwifiex_process_rx(struct mwifiex_adapter *adapter)
                        adapter->delay_main_work = false;
                        mwifiex_queue_main_work(adapter);
                }
-               mwifiex_handle_rx_packet(adapter, skb);
+               rx_info = MWIFIEX_SKB_RXCB(skb);
+               if (rx_info->buf_type == MWIFIEX_TYPE_AGGR_DATA) {
+                       if (adapter->if_ops.deaggr_pkt)
+                               adapter->if_ops.deaggr_pkt(adapter, skb);
+                       dev_kfree_skb_any(skb);
+               } else {
+                       mwifiex_handle_rx_packet(adapter, skb);
+               }
        }
        spin_lock_irqsave(&adapter->rx_proc_lock, flags);
        adapter->rx_processing = false;