From c8254d268fc49ff900310ba8e7ff419e272fbc9e Mon Sep 17 00:00:00 2001 From: Roland Vossen Date: Tue, 12 Apr 2011 14:34:41 +0200 Subject: [PATCH] --- yaml --- r: 249159 b: refs/heads/master c: e9c661e08c2a6015c1b7cba1cecefa27a089df71 h: refs/heads/master i: 249157: 05d4f991358e4ac8120b39a2ee6a9b7b502297eb 249155: f7e2bd7e0eaf9156d663edb30de889c138860527 249151: e6ec034eb1e8684e2fc8ff86fd70346f48c3f661 v: v3 --- [refs] | 2 +- .../drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c | 13 +++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 44d37061d065..21dbca81d058 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a1c5ad817d9316926372a4a708027edda80146e4 +refs/heads/master: e9c661e08c2a6015c1b7cba1cecefa27a089df71 diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c index 980344912ee7..07fbc3d46c8e 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c +++ b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c @@ -1122,21 +1122,12 @@ wlc_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb, ini->txretry[index] = 0; /* ampdu_ack_len: number of acked aggregated frames */ - /* ampdu_ack_map: block ack bit map for the aggregation */ /* ampdu_len: number of aggregated frames */ rate_status(wlc, tx_info, txs, mcs); tx_info->flags |= IEEE80211_TX_STAT_ACK; tx_info->flags |= IEEE80211_TX_STAT_AMPDU; - - /* XXX TODO: Make these accurate. */ tx_info->status.ampdu_ack_len = - (txs-> - status & TX_STATUS_FRM_RTX_MASK) >> - TX_STATUS_FRM_RTX_SHIFT; - tx_info->status.ampdu_len = - (txs-> - status & TX_STATUS_FRM_RTX_MASK) >> - TX_STATUS_FRM_RTX_SHIFT; + tx_info->status.ampdu_len = 1; skb_pull(p, D11_PHY_HDR_LEN); skb_pull(p, D11_TXH_LEN); @@ -1162,6 +1153,8 @@ wlc_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb, /* Retry timeout */ ini->tx_in_transit--; ieee80211_tx_info_clear_status(tx_info); + tx_info->status.ampdu_ack_len = 0; + tx_info->status.ampdu_len = 1; tx_info->flags |= IEEE80211_TX_STAT_AMPDU_NO_BACK; skb_pull(p, D11_PHY_HDR_LEN);