Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04012895 authored by Hante Meuleman's avatar Hante Meuleman Committed by John W. Linville
Browse files

brcmfmac: use define instead of hardcoded values. 



brcmf_parse_tlvs was using hardcoded values.

Reviewed-by: default avatarArend Van Spriel <arend@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: default avatarHante Meuleman <meuleman@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f09d0c02

drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c

+6 −4
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ 
#define BRCMF_PNO_SCAN_COMPLETE		1

#define BRCMF_PNO_SCAN_INCOMPLETE	0



#define TLV_HDR_LEN			2	/* header length */



#define BRCMF_ASSOC_PARAMS_FIXED_SIZE \

	(sizeof(struct brcmf_assoc_params_le) - sizeof(u16))
@@ -2608,15 +2610,15 @@ static struct brcmf_tlv *brcmf_parse_tlvs(void *buf, int buflen, uint key) 
	totlen = buflen;



	/* find tagged parameter */

	while (totlen >= 2) {

	while (totlen >= TLV_HDR_LEN) {

		int len = elt->len;



		/* validate remaining totlen */

		if ((elt->id == key) && (totlen >= (len + 2)))

		if ((elt->id == key) && (totlen >= (len + TLV_HDR_LEN)))

			return elt;



		elt = (struct brcmf_tlv *) ((u8 *) elt + (len + 2));

		totlen -= (len + 2);

		elt = (struct brcmf_tlv *) ((u8 *) elt + (len + TLV_HDR_LEN));

		totlen -= (len + TLV_HDR_LEN);

	}



	return NULL;