diff options
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/ampdu.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c b/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c index dbee69620a90..95b5902bc4b3 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c | |||
@@ -959,14 +959,13 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb, | |||
959 | if (supr_status) { | 959 | if (supr_status) { |
960 | update_rate = false; | 960 | update_rate = false; |
961 | if (supr_status == TX_STATUS_SUPR_BADCH) { | 961 | if (supr_status == TX_STATUS_SUPR_BADCH) { |
962 | wiphy_err(wiphy, "%s: Pkt tx suppressed, " | 962 | wiphy_err(wiphy, |
963 | "illegal channel possibly %d\n", | 963 | "%s: Pkt tx suppressed, illegal channel possibly %d\n", |
964 | __func__, CHSPEC_CHANNEL( | 964 | __func__, CHSPEC_CHANNEL( |
965 | wlc->default_bss->chanspec)); | 965 | wlc->default_bss->chanspec)); |
966 | } else { | 966 | } else { |
967 | if (supr_status != TX_STATUS_SUPR_FRAG) | 967 | if (supr_status != TX_STATUS_SUPR_FRAG) |
968 | wiphy_err(wiphy, "%s:" | 968 | wiphy_err(wiphy, "%s: supr_status 0x%x\n", |
969 | "supr_status 0x%x\n", | ||
970 | __func__, supr_status); | 969 | __func__, supr_status); |
971 | } | 970 | } |
972 | /* no need to retry for badch; will fail again */ | 971 | /* no need to retry for badch; will fail again */ |
@@ -988,9 +987,8 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb, | |||
988 | } | 987 | } |
989 | } else if (txs->phyerr) { | 988 | } else if (txs->phyerr) { |
990 | update_rate = false; | 989 | update_rate = false; |
991 | wiphy_err(wiphy, "wl%d: ampdu tx phy " | 990 | wiphy_err(wiphy, "%s: ampdu tx phy error (0x%x)\n", |
992 | "error (0x%x)\n", wlc->pub->unit, | 991 | __func__, txs->phyerr); |
993 | txs->phyerr); | ||
994 | 992 | ||
995 | if (brcm_msg_level & LOG_ERROR_VAL) { | 993 | if (brcm_msg_level & LOG_ERROR_VAL) { |
996 | brcmu_prpkt("txpkt (AMPDU)", p); | 994 | brcmu_prpkt("txpkt (AMPDU)", p); |
@@ -1018,10 +1016,10 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb, | |||
1018 | ack_recd = false; | 1016 | ack_recd = false; |
1019 | if (ba_recd) { | 1017 | if (ba_recd) { |
1020 | bindex = MODSUB_POW2(seq, start_seq, SEQNUM_MAX); | 1018 | bindex = MODSUB_POW2(seq, start_seq, SEQNUM_MAX); |
1021 | BCMMSG(wlc->wiphy, "tid %d seq %d," | 1019 | BCMMSG(wiphy, |
1022 | " start_seq %d, bindex %d set %d, index %d\n", | 1020 | "tid %d seq %d, start_seq %d, bindex %d set %d, index %d\n", |
1023 | tid, seq, start_seq, bindex, | 1021 | tid, seq, start_seq, bindex, |
1024 | isset(bitmap, bindex), index); | 1022 | isset(bitmap, bindex), index); |
1025 | /* if acked then clear bit and free packet */ | 1023 | /* if acked then clear bit and free packet */ |
1026 | if ((bindex < AMPDU_TX_BA_MAX_WSIZE) | 1024 | if ((bindex < AMPDU_TX_BA_MAX_WSIZE) |
1027 | && isset(bitmap, bindex)) { | 1025 | && isset(bitmap, bindex)) { |