diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-02-29 14:53:21 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-29 14:53:21 -0500 |
| commit | 8701ff0a88bcfc8c7dced3842919ad8d016a6835 (patch) | |
| tree | ba71774b83e92d6507a398024a6d89b146181320 /drivers/net/wireless/brcm80211 | |
| parent | f4fb4b212d2668f831918023bc3ca451997faee6 (diff) | |
| parent | 00f157b49780e194c38dafdf9df8e10b8a6a9626 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/brcm80211')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/ampdu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c b/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c index c1ce831b9bf4..dbee69620a90 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c | |||
| @@ -1070,9 +1070,9 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb, | |||
| 1070 | IEEE80211_TX_STAT_AMPDU_NO_BACK; | 1070 | IEEE80211_TX_STAT_AMPDU_NO_BACK; |
| 1071 | skb_pull(p, D11_PHY_HDR_LEN); | 1071 | skb_pull(p, D11_PHY_HDR_LEN); |
| 1072 | skb_pull(p, D11_TXH_LEN); | 1072 | skb_pull(p, D11_TXH_LEN); |
| 1073 | wiphy_err(wiphy, "%s: BA Timeout, seq %d, in_" | 1073 | BCMMSG(wiphy, |
| 1074 | "transit %d\n", "AMPDU status", seq, | 1074 | "BA Timeout, seq %d, in_transit %d\n", |
| 1075 | ini->tx_in_transit); | 1075 | seq, ini->tx_in_transit); |
| 1076 | ieee80211_tx_status_irqsafe(wlc->pub->ieee_hw, | 1076 | ieee80211_tx_status_irqsafe(wlc->pub->ieee_hw, |
| 1077 | p); | 1077 | p); |
| 1078 | } | 1078 | } |