Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 369145
b: refs/heads/master
c: 2af1558
h: refs/heads/master
i:
  369143: e7aba41
v: v3
  • Loading branch information
Arend van Spriel authored and John W. Linville committed Apr 3, 2013
1 parent d559d87 commit 9538d85
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0f8b5cc5214b0c8c772d9ba0a41f5b1f07aff274
refs/heads/master: 2af15580f5f3bb814b80d0616cafd7646644ef7e
6 changes: 3 additions & 3 deletions trunk/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -1013,15 +1012,16 @@ 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;

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:
Expand Down

0 comments on commit 9538d85

Please sign in to comment.