diff options
author | Alwin Beukers <alwin@broadcom.com> | 2011-10-12 14:51:28 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-10-14 14:48:19 -0400 |
commit | f8e4b412c9df596557baf36f9d9635fd4f55a2a0 (patch) | |
tree | 50738dc11f1ff895c8383c41ee1fd9667375f952 /drivers/net/wireless/brcm80211/brcmutil/utils.c | |
parent | b0551fb7e01d76165367ce77ddfcb80009b31427 (diff) |
brcm80211: moved function brcmu_parse_tlvs
Moved the brcmu_parse_tlvs function and brcmu_tlv structure into
the only file using them. Names were adjusted accordingly.
Reported-by: Johannes Berg <johannes@sipsolutions.net>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmutil/utils.c')
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmutil/utils.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmutil/utils.c b/drivers/net/wireless/brcm80211/brcmutil/utils.c index 74eb1e6f060b..b612742ad5c9 100644 --- a/drivers/net/wireless/brcm80211/brcmutil/utils.c +++ b/drivers/net/wireless/brcm80211/brcmutil/utils.c | |||
@@ -364,36 +364,6 @@ void brcmu_prpkt(const char *msg, struct sk_buff *p0) | |||
364 | EXPORT_SYMBOL(brcmu_prpkt); | 364 | EXPORT_SYMBOL(brcmu_prpkt); |
365 | #endif /* defined(BCMDBG) */ | 365 | #endif /* defined(BCMDBG) */ |
366 | 366 | ||
367 | /* | ||
368 | * Traverse a string of 1-byte tag/1-byte length/variable-length value | ||
369 | * triples, returning a pointer to the substring whose first element | ||
370 | * matches tag | ||
371 | */ | ||
372 | struct brcmu_tlv *brcmu_parse_tlvs(void *buf, int buflen, uint key) | ||
373 | { | ||
374 | struct brcmu_tlv *elt; | ||
375 | int totlen; | ||
376 | |||
377 | elt = (struct brcmu_tlv *) buf; | ||
378 | totlen = buflen; | ||
379 | |||
380 | /* find tagged parameter */ | ||
381 | while (totlen >= 2) { | ||
382 | int len = elt->len; | ||
383 | |||
384 | /* validate remaining totlen */ | ||
385 | if ((elt->id == key) && (totlen >= (len + 2))) | ||
386 | return elt; | ||
387 | |||
388 | elt = (struct brcmu_tlv *) ((u8 *) elt + (len + 2)); | ||
389 | totlen -= (len + 2); | ||
390 | } | ||
391 | |||
392 | return NULL; | ||
393 | } | ||
394 | EXPORT_SYMBOL(brcmu_parse_tlvs); | ||
395 | |||
396 | |||
397 | #if defined(BCMDBG) | 367 | #if defined(BCMDBG) |
398 | int | 368 | int |
399 | brcmu_format_flags(const struct brcmu_bit_desc *bd, u32 flags, char *buf, | 369 | brcmu_format_flags(const struct brcmu_bit_desc *bd, u32 flags, char *buf, |