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

Commit 291da87b authored by Arend van Spriel's avatar Arend van Spriel Committed by Kalle Valo
Browse files

brcmfmac: add mapping for interface index to bsscfg index 



Because the P2P Device interface in firmware uses the same interface
index as the primary interface we use the bsscfg index as index in the
struct brcmf_pub::iflist. However, in the data path we get the interface
index and not the bsscfg index. So we need a mapping of interface index
to bsscfg index, which can be determined upon handle adding the interface.

Reviewed-by: default avatarHante Meuleman <meuleman@broadcom.com>
Reviewed-by: default avatarFranky (Zhenhui) Lin <frankyl@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 054e68ad

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

+13 −9
Original line number Original line Diff line number Diff line
@@ -85,21 +85,20 @@ char *brcmf_ifname(struct brcmf_pub *drvr, int ifidx) 




struct brcmf_if *brcmf_get_ifp(struct brcmf_pub *drvr, int ifidx)

struct brcmf_if *brcmf_get_ifp(struct brcmf_pub *drvr, int ifidx)

{

{

	struct brcmf_if *ifp;

	s32 bssidx;



	if (ifidx < 0 || ifidx >= BRCMF_MAX_IFS) {

	if (ifidx < 0 || ifidx >= BRCMF_MAX_IFS) {

		brcmf_err("ifidx %d out of range\n", ifidx);

		brcmf_err("ifidx %d out of range\n", ifidx);

		return NULL;

		return NULL;

	}

	}





	/* The ifidx is the idx to map to matching netdev/ifp. When receiving

	ifp = NULL;

	 * events this is easy because it contains the bssidx which maps

	bssidx = drvr->if2bss[ifidx];

	 * 1-on-1 to the netdev/ifp. But for data frames the ifidx is rcvd.

	if (bssidx >= 0)

	 * bssidx 1 is used for p2p0 and no data can be received or

		ifp = drvr->iflist[bssidx];

	 * transmitted on it. Therefor bssidx is ifidx + 1 if ifidx > 0

	 */

	if (ifidx)

		ifidx++;





	return drvr->iflist[ifidx];

	return ifp;

}

}





static void _brcmf_set_multicast_list(struct work_struct *work)

static void _brcmf_set_multicast_list(struct work_struct *work)
@@ -831,6 +830,8 @@ struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, s32 bssidx, s32 ifidx, 




		ifp = netdev_priv(ndev);

		ifp = netdev_priv(ndev);

		ifp->ndev = ndev;

		ifp->ndev = ndev;

		/* store mapping ifidx to bssidx */

		drvr->if2bss[ifidx] = bssidx;

	}

	}





	ifp->drvr = drvr;

	ifp->drvr = drvr;
@@ -855,6 +856,7 @@ static void brcmf_del_if(struct brcmf_pub *drvr, s32 bssidx) 
	struct brcmf_if *ifp;

	struct brcmf_if *ifp;





	ifp = drvr->iflist[bssidx];

	ifp = drvr->iflist[bssidx];

	drvr->if2bss[ifp->ifidx] = -1;

	drvr->iflist[bssidx] = NULL;

	drvr->iflist[bssidx] = NULL;

	if (!ifp) {

	if (!ifp) {

		brcmf_err("Null interface, idx=%d\n", bssidx);

		brcmf_err("Null interface, idx=%d\n", bssidx);
@@ -862,6 +864,7 @@ static void brcmf_del_if(struct brcmf_pub *drvr, s32 bssidx) 
	}

	}

	brcmf_dbg(TRACE, "Enter, idx=%d, ifidx=%d\n", bssidx, ifp->ifidx);

	brcmf_dbg(TRACE, "Enter, idx=%d, ifidx=%d\n", bssidx, ifp->ifidx);

	if (ifp->ndev) {

	if (ifp->ndev) {

		drvr->if2bss[ifp->ifidx] = -1;

		if (bssidx == 0) {

		if (bssidx == 0) {

			if (ifp->ndev->netdev_ops == &brcmf_netdev_ops_pri) {

			if (ifp->ndev->netdev_ops == &brcmf_netdev_ops_pri) {

				rtnl_lock();

				rtnl_lock();
@@ -926,6 +929,7 @@ int brcmf_attach(struct device *dev) 
	if (!drvr)

	if (!drvr)

		return -ENOMEM;

		return -ENOMEM;





	memset(drvr->if2bss, 0xFF, sizeof(drvr->if2bss));

	mutex_init(&drvr->proto_block);

	mutex_init(&drvr->proto_block);





	/* Link to bus module */

	/* Link to bus module */

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -122,6 +122,7 @@ struct brcmf_pub { 
	struct mac_address addresses[BRCMF_MAX_IFS];

	struct mac_address addresses[BRCMF_MAX_IFS];





	struct brcmf_if *iflist[BRCMF_MAX_IFS];

	struct brcmf_if *iflist[BRCMF_MAX_IFS];

	s32 if2bss[BRCMF_MAX_IFS];





	struct mutex proto_block;

	struct mutex proto_block;

	unsigned char proto_buf[BRCMF_DCMD_MAXLEN];

	unsigned char proto_buf[BRCMF_DCMD_MAXLEN];