aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArend van Spriel <arend@broadcom.com>2013-04-03 12:40:42 +0200
committerJohn W. Linville <linville@tuxdriver.com>2013-04-03 15:07:06 -0400
commit2af15580f5f3bb814b80d0616cafd7646644ef7e (patch)
treef80f29d5d4129f29e0af8b7d9b1f03960bad246a
parent0f8b5cc5214b0c8c772d9ba0a41f5b1f07aff274 (diff)
downloadbluetooth-next-2af15580f5f3bb814b80d0616cafd7646644ef7e.tar.gz
brcmfmac: avoid error output in receive path
Parsing the tlv upon receiving frames can fail. Instead of printing an error message, just count the parse failure. On some devices we receive a lot of invalid tlv signals. this commit will be squashed. Signed-off-by: Arend van Spriel <arend@broadcom.com> Change-Id: I08e0f62c55e5028f9aa70c396d291679abd273c9 Reviewed-on: http://lb-bun-88.bun.broadcom.com:8080/72 Reviewed-by: Hante Meuleman <meuleman@broadcom.com> Reviewed-by: Piotr Haber <phaber@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
index eb63419cece065..314aedc0f9b340 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
@@ -440,7 +440,6 @@ static int brcmf_fws_get_tlv_len(struct brcmf_fws_info *fws,
switch (id) {
BRCMF_FWS_TLV_DEFLIST
default:
- brcmf_err("invalid tlv id: %d\n", id);
fws->stats.tlv_invalid_type++;
break;
}
@@ -1013,6 +1012,9 @@ int brcmf_fws_hdrpull(struct brcmf_pub *drvr, int ifidx, s16 signal_len,
len = signal_data[1];
data = signal_data + 2;
+ brcmf_dbg(INFO, "tlv type=%d (%s), len=%d, data[0]=%d\n", type,
+ brcmf_fws_get_tlv_name(type), len, *data);
+
/* abort parsing when length invalid */
if (data_len < len + 2)
break;
@@ -1020,8 +1022,6 @@ int brcmf_fws_hdrpull(struct brcmf_pub *drvr, int ifidx, s16 signal_len,
if (len != brcmf_fws_get_tlv_len(fws, type))
break;
- brcmf_dbg(INFO, "tlv type=%d (%s), len=%d\n", type,
- brcmf_fws_get_tlv_name(type), len);
switch (type) {
case BRCMF_FWS_TYPE_MAC_OPEN:
case BRCMF_FWS_TYPE_MAC_CLOSE: