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

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

brcmfmac: remove redundant function brcmf_c_mkiovar_bsscfg 



function brcmf_c_mkiovar_bsscfg became redundant with refactoring
of firmware interface layer.

Reviewed-by: default avatarArend Van Spriel <arend@broadcom.com>
Signed-off-by: default avatarHante Meuleman <meuleman@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f368a5b6

drivers/net/wireless/brcm80211/brcmfmac/dhd.h

+0 −2
Original line number Diff line number Diff line
@@ -709,8 +709,6 @@ extern const struct bcmevent_name bcmevent_names[]; 


extern uint brcmf_c_mkiovar(char *name, char *data, uint datalen,

			  char *buf, uint len);

extern uint brcmf_c_mkiovar_bsscfg(char *name, char *data, uint datalen,

				   char *buf, uint buflen, s32 bssidx);



extern int brcmf_netdev_wait_pend8021x(struct net_device *ndev);

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

+0 −46
Original line number Diff line number Diff line
@@ -88,52 +88,6 @@ brcmf_c_mkiovar(char *name, char *data, uint datalen, char *buf, uint buflen) 
	return len;

}



uint

brcmf_c_mkiovar_bsscfg(char *name, char *data, uint datalen,

		       char *buf, uint buflen, s32 bssidx)

{

	const s8 *prefix = "bsscfg:";

	s8 *p;

	u32 prefixlen;

	u32 namelen;

	u32 iolen;

	__le32 bssidx_le;



	if (bssidx == 0)

		return brcmf_c_mkiovar(name, data, datalen, buf, buflen);



	prefixlen = (u32) strlen(prefix); /* lengh of bsscfg prefix */

	namelen = (u32) strlen(name) + 1; /* lengh of iovar  name + null */

	iolen = prefixlen + namelen + sizeof(bssidx_le) + datalen;



	if ((u32)buflen < iolen) {

		brcmf_dbg(ERROR, "buffer is too short\n");

		return 0;

	}



	p = buf;



	/* copy prefix, no null */

	memcpy(p, prefix, prefixlen);

	p += prefixlen;



	/* copy iovar name including null */

	memcpy(p, name, namelen);

	p += namelen;



	/* bss config index as first data */

	bssidx_le = cpu_to_le32(bssidx);

	memcpy(p, &bssidx_le, sizeof(bssidx_le));

	p += sizeof(bssidx_le);



	/* parameter buffer follows */

	if (datalen)

		memcpy(p, data, datalen);



	return iolen;



}



bool brcmf_c_prec_enq(struct device *dev, struct pktq *q,

		      struct sk_buff *pkt, int prec)

{