← Back to branch summary

~ubuntu-branches/ubuntu/vivid/linux-backports-modules-3.2.0/vivid

« back to all changes in this revision

Viewing changes to updates/cw-3.3/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c

  • Committer: Package Import Robot
  • Author(s): Leann Ogasawara
  • Date: 2012-03-29 09:17:55 UTC
  • Revision ID: package-import@ubuntu.com-20120329091755-1xmgit6xf3ch02r5
Tags: 3.2.0-21.4
* Update to compat-wireless-3.3-2-n 
* Bump ABI for Precise 3.2.0-21.34 

Show diffs side-by-side

added added

removed removed

Lines of Context:
updates/cw-3.3/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
1051
1051
                }
1052
1052
                /* either retransmit or send bar if ack not recd */
1053
1053
                if (!ack_recd) {
1054
 
                        struct ieee80211_tx_rate *txrate =
1055
 
                            tx_info->status.rates;
1056
 
                        if (retry && (txrate[0].count < (int)retry_limit)) {
 
1054
                        if (retry && (ini->txretry[index] < (int)retry_limit)) {
1057
1055
                                ini->txretry[index]++;
1058
1056
                                ini->tx_in_transit--;
1059
1057
                                /*
1060
1058
                                 * Use high prededence for retransmit to
1061
1059
                                 * give some punch
1062
1060
                                 */
1063
 
                                /* brcms_c_txq_enq(wlc, scb, p,
1064
 
                                 * BRCMS_PRIO_TO_PREC(tid)); */
1065
1061
                                brcms_c_txq_enq(wlc, scb, p,
1066
1062
                                                BRCMS_PRIO_TO_HI_PREC(tid));
1067
1063
                        } else {
1074
1070
                                    IEEE80211_TX_STAT_AMPDU_NO_BACK;
1075
1071
                                skb_pull(p, D11_PHY_HDR_LEN);
1076
1072
                                skb_pull(p, D11_TXH_LEN);
1077
 
                                wiphy_err(wiphy, "%s: BA Timeout, seq %d, in_"
1078
 
                                        "transit %d\n", "AMPDU status", seq,
1079
 
                                        ini->tx_in_transit);
 
1073
                                BCMMSG(wiphy,
 
1074
                                       "BA Timeout, seq %d, in_transit %d\n",
 
1075
                                       seq, ini->tx_in_transit);
1080
1076
                                ieee80211_tx_status_irqsafe(wlc->pub->ieee_hw,
1081
1077
                                                            p);
1082
1078
                        }