mac80211: move aggregation callback processing

This moves the aggregation callback processing
to the per-sdata skb queue and a work function
rather than the tasklet.

Unfortunately, this means that it extends the
pkt_type hack to that skb queue. However, it
will enable making ampdu_action API changes
gradually, my current plan is to get rid of
this again by forcing drivers to only return
from ampdu_action() when everything is done,
thus removing the callbacks completely.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 5 insertions, 0 deletions

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index b716fa2370b3..84f11733b9fe 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -741,6 +741,7 @@ static void ieee80211_rx_reorder_ampdu(struct ieee80211_rx_data *rx,
         sc = le16_to_cpu(hdr->seq_ctrl);
         if (sc & IEEE80211_SCTL_FRAG) {
                 spin_unlock(&sta->lock);
+                skb->pkt_type = IEEE80211_SDATA_QUEUE_TYPE_FRAME;
                 skb_queue_tail(&rx->sdata->skb_queue, skb);
                 ieee80211_queue_work(&local->hw, &rx->sdata->work);
                 return;
@@ -1969,6 +1970,7 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx)
                         goto invalid;
                 }
 
+                rx->skb->pkt_type = IEEE80211_SDATA_QUEUE_TYPE_FRAME;
                 skb_queue_tail(&sdata->skb_queue, rx->skb);
                 ieee80211_queue_work(&local->hw, &sdata->work);
                 return RX_QUEUED;
@@ -2001,6 +2003,7 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx)
                         if (memcmp(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN))
                                 break;
 
+                        rx->skb->pkt_type = IEEE80211_SDATA_QUEUE_TYPE_FRAME;
                         skb_queue_tail(&sdata->skb_queue, rx->skb);
                         ieee80211_queue_work(&local->hw, &sdata->work);
                         return RX_QUEUED;
@@ -2023,6 +2026,7 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx)
         case WLAN_CATEGORY_MESH_PATH_SEL:
                 if (!ieee80211_vif_is_mesh(&sdata->vif))
                         break;
+                rx->skb->pkt_type = IEEE80211_SDATA_QUEUE_TYPE_FRAME;
                 skb_queue_tail(&sdata->skb_queue, rx->skb);
                 ieee80211_queue_work(&local->hw, &sdata->work);
                 return RX_QUEUED;
@@ -2128,6 +2132,7 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_data *rx)
         }
 
         /* queue up frame and kick off work to process it */
+        rx->skb->pkt_type = IEEE80211_SDATA_QUEUE_TYPE_FRAME;
         skb_queue_tail(&sdata->skb_queue, rx->skb);
         ieee80211_queue_work(&rx->local->hw, &sdata->work);