diff options
| author | Joe Perches <joe@perches.com> | 2013-02-13 20:33:20 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-02-14 14:24:08 -0500 |
| commit | e81c7e93b8f047bd0fe2cd150b0866c9da4c201d (patch) | |
| tree | 9f8b4d16acc4ac67a368dbf3f49c8af61e826c18 /drivers | |
| parent | bdb084b22d8aee66c87af5e9c36bd6cf7f3bccfd (diff) | |
brcmsmac: Downgrade d11hdrs_mac80211 error messages to warnings.
These messages don't seem to be errors but notifications
that some attribute isn't quite right.
Don't mark them as errors.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/main.c | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c index e80825e39c6e..b3ea15ecd68c 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/main.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c | |||
| @@ -6443,10 +6443,9 @@ brcms_c_d11hdrs_mac80211(struct brcms_c_info *wlc, struct ieee80211_hw *hw, | |||
| 6443 | 6443 | ||
| 6444 | if ((txrate[k]->flags & IEEE80211_TX_RC_MCS) | 6444 | if ((txrate[k]->flags & IEEE80211_TX_RC_MCS) |
| 6445 | && (!is_mcs_rate(rspec[k]))) { | 6445 | && (!is_mcs_rate(rspec[k]))) { |
| 6446 | brcms_err(wlc->hw->d11core, | 6446 | brcms_warn(wlc->hw->d11core, |
| 6447 | "wl%d: %s: IEEE80211_TX_" | 6447 | "wl%d: %s: IEEE80211_TX_RC_MCS != is_mcs_rate(rspec)\n", |
| 6448 | "RC_MCS != is_mcs_rate(rspec)\n", | 6448 | wlc->pub->unit, __func__); |
| 6449 | wlc->pub->unit, __func__); | ||
| 6450 | } | 6449 | } |
| 6451 | 6450 | ||
| 6452 | if (is_mcs_rate(rspec[k])) { | 6451 | if (is_mcs_rate(rspec[k])) { |
| @@ -6838,21 +6837,19 @@ brcms_c_d11hdrs_mac80211(struct brcms_c_info *wlc, struct ieee80211_hw *hw, | |||
| 6838 | wlc->fragthresh[queue] = | 6837 | wlc->fragthresh[queue] = |
| 6839 | (u16) newfragthresh; | 6838 | (u16) newfragthresh; |
| 6840 | } else { | 6839 | } else { |
| 6841 | brcms_err(wlc->hw->d11core, | 6840 | brcms_warn(wlc->hw->d11core, |
| 6842 | "wl%d: %s txop invalid " | 6841 | "wl%d: %s txop invalid for rate %d\n", |
| 6843 | "for rate %d\n", | 6842 | wlc->pub->unit, fifo_names[queue], |
| 6844 | wlc->pub->unit, fifo_names[queue], | 6843 | rspec2rate(rspec[0])); |
| 6845 | rspec2rate(rspec[0])); | ||
| 6846 | } | 6844 | } |
| 6847 | 6845 | ||
| 6848 | if (dur > wlc->edcf_txop[ac]) | 6846 | if (dur > wlc->edcf_txop[ac]) |
| 6849 | brcms_err(wlc->hw->d11core, | 6847 | brcms_warn(wlc->hw->d11core, |
| 6850 | "wl%d: %s: %s txop " | 6848 | "wl%d: %s: %s txop exceeded phylen %d/%d dur %d/%d\n", |
| 6851 | "exceeded phylen %d/%d dur %d/%d\n", | 6849 | wlc->pub->unit, __func__, |
| 6852 | wlc->pub->unit, __func__, | 6850 | fifo_names[queue], |
| 6853 | fifo_names[queue], | 6851 | phylen, wlc->fragthresh[queue], |
| 6854 | phylen, wlc->fragthresh[queue], | 6852 | dur, wlc->edcf_txop[ac]); |
| 6855 | dur, wlc->edcf_txop[ac]); | ||
| 6856 | } | 6853 | } |
| 6857 | } | 6854 | } |
| 6858 | 6855 | ||