diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-25 15:13:37 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-25 15:13:37 -0400 |
| commit | 202149265770426f0965557ffa0b500fbbd701dd (patch) | |
| tree | 3a6fe0c357b6eb6ac5e15a0ec27eaf570ebfd0ce /drivers/net/wireless/brcm80211/brcmsmac/main.c | |
| parent | f891ea1634ce41f5f47ae40d8594809f4cd2ca66 (diff) | |
| parent | 395836282f7cf8b1dac9b9c2aa2bacddfa1580b5 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmsmac/main.c')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c index 7083db75b00c..b4d92792c502 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/main.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c @@ -847,8 +847,7 @@ brcms_c_dotxstatus(struct brcms_c_info *wlc, struct tx_status *txs) */ if (!(txs->status & TX_STATUS_AMPDU) && (txs->status & TX_STATUS_INTERMEDIATE)) { - wiphy_err(wlc->wiphy, "%s: INTERMEDIATE but not AMPDU\n", - __func__); + BCMMSG(wlc->wiphy, "INTERMEDIATE but not AMPDU\n"); return false; } |