diff options
| author |   Felix Fietkau <nbd@nbd.name> | 2018-01-24 16:19:15 +0100 |
|---|---|---|
| committer |   Kalle Valo <kvalo@codeaurora.org> | 2018-01-26 11:18:43 +0200 |
| commit | 9d9d738b4b54c8b04928168663761fe934b43ad8 (patch) | |
| tree | 19eeca8edb9f325b908de97a4592712be1a0b7ef /drivers/net/wireless/mediatek/mt76/mac80211.c | |
| parent | mt76: implement A-MPDU rx reordering in the driver code (diff) | |
| download | linux-dev-9d9d738b4b54c8b04928168663761fe934b43ad8.tar.xz linux-dev-9d9d738b4b54c8b04928168663761fe934b43ad8.zip | |
mt76: split mt76_rx_complete
Add a separate function for processing frames after A-MPDU reordering,
reduce code duplication
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/mediatek/mt76/mac80211.c')
| -rw-r--r-- | drivers/net/wireless/mediatek/mt76/mac80211.c | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c index 5978e5b0a2fe..77f1be161009 100644 --- a/drivers/net/wireless/mediatek/mt76/mac80211.c +++ b/drivers/net/wireless/mediatek/mt76/mac80211.c @@ -384,7 +384,7 @@ int mt76_get_survey(struct ieee80211_hw *hw, int idx, } EXPORT_SYMBOL_GPL(mt76_get_survey); -struct ieee80211_sta *mt76_rx_convert(struct sk_buff *skb) +static struct ieee80211_sta *mt76_rx_convert(struct sk_buff *skb) { struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb); struct mt76_rx_status mstat; @@ -410,9 +410,24 @@ struct ieee80211_sta *mt76_rx_convert(struct sk_buff *skb) return wcid_to_sta(mstat.wcid); } -void mt76_rx_complete(struct mt76_dev *dev, enum mt76_rxq_id q) +void mt76_rx_complete(struct mt76_dev *dev, struct sk_buff_head *frames, + int queue) { + struct napi_struct *napi = NULL; struct ieee80211_sta *sta; + struct sk_buff *skb; + + if (queue >= 0) + napi = &dev->napi[queue]; + + while ((skb = __skb_dequeue(frames)) != NULL) { + sta = mt76_rx_convert(skb); + ieee80211_rx_napi(dev->hw, sta, skb, napi); + } +} + +void mt76_rx_poll_complete(struct mt76_dev *dev, enum mt76_rxq_id q) +{ struct sk_buff_head frames; struct sk_buff *skb; @@ -421,8 +436,5 @@ void mt76_rx_complete(struct mt76_dev *dev, enum mt76_rxq_id q) while ((skb = __skb_dequeue(&dev->rx_skb[q])) != NULL) mt76_rx_aggr_reorder(skb, &frames); - while ((skb = __skb_dequeue(&frames)) != NULL) { - sta = mt76_rx_convert(skb); - ieee80211_rx_napi(dev->hw, sta, skb, &dev->napi[q]); - } + mt76_rx_complete(dev, &frames, q); } |