提交 cb139ecc 编写于 作者: C Christian Lamparter 提交者: John W. Linville

carl9170: fix tx_ampdu_upload counter

tx_ampdu_upload was not decreased when an a-MPDU
frame had to be kicked out from the tx_pending
queues.

This broke ampdu aggregation, because the scheduler
waits until tx_ampdu_upload drops to zero, before
making the next aggregate.
Signed-off-by: NChristian Lamparter <chunkeey@googlemail.com>
Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
上级 042c53f6
...@@ -230,8 +230,15 @@ static void carl9170_flush(struct ar9170 *ar, bool drop_queued) ...@@ -230,8 +230,15 @@ static void carl9170_flush(struct ar9170 *ar, bool drop_queued)
for (i = 0; i < ar->hw->queues; i++) { for (i = 0; i < ar->hw->queues; i++) {
struct sk_buff *skb; struct sk_buff *skb;
while ((skb = skb_dequeue(&ar->tx_pending[i]))) while ((skb = skb_dequeue(&ar->tx_pending[i]))) {
struct ieee80211_tx_info *info;
info = IEEE80211_SKB_CB(skb);
if (info->flags & IEEE80211_TX_CTL_AMPDU)
atomic_dec(&ar->tx_ampdu_upload);
carl9170_tx_status(ar, skb, false); carl9170_tx_status(ar, skb, false);
}
} }
} }
...@@ -1462,6 +1469,7 @@ static void carl9170_op_sta_notify(struct ieee80211_hw *hw, ...@@ -1462,6 +1469,7 @@ static void carl9170_op_sta_notify(struct ieee80211_hw *hw,
skb_queue_walk_safe(&ar->tx_pending[i], skb, tmp) { skb_queue_walk_safe(&ar->tx_pending[i], skb, tmp) {
struct _carl9170_tx_superframe *super; struct _carl9170_tx_superframe *super;
struct ieee80211_hdr *hdr; struct ieee80211_hdr *hdr;
struct ieee80211_tx_info *info;
super = (void *) skb->data; super = (void *) skb->data;
hdr = (void *) super->frame_data; hdr = (void *) super->frame_data;
...@@ -1470,6 +1478,11 @@ static void carl9170_op_sta_notify(struct ieee80211_hw *hw, ...@@ -1470,6 +1478,11 @@ static void carl9170_op_sta_notify(struct ieee80211_hw *hw,
continue; continue;
__skb_unlink(skb, &ar->tx_pending[i]); __skb_unlink(skb, &ar->tx_pending[i]);
info = IEEE80211_SKB_CB(skb);
if (info->flags & IEEE80211_TX_CTL_AMPDU)
atomic_dec(&ar->tx_ampdu_upload);
carl9170_tx_status(ar, skb, false); carl9170_tx_status(ar, skb, false);
} }
spin_unlock_bh(&ar->tx_pending[i].lock); spin_unlock_bh(&ar->tx_pending[i].lock);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册