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

Commit 6ea696eb authored by Hante Meuleman's avatar Hante Meuleman Committed by Kalle Valo
Browse files

brcmfmac: Only assign primary netdev to if2bss array. 



The if2bss allows for translation of ifidx to bssidx which has a 1:n
relation. Therefor only the first (primary) netdev should be
assigned in this array. This fixes the p2pon=1 module param usage.

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 avatarKalle Valo <kvalo@codeaurora.org>
parent 60dc35ef

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

+10 −4
Original line number Original line Diff line number Diff line
@@ -53,6 +53,8 @@ MODULE_LICENSE("Dual BSD/GPL"); 
#define BRCMF_RXREORDER_EXPIDX_VALID		0x08

#define BRCMF_RXREORDER_EXPIDX_VALID		0x08

#define BRCMF_RXREORDER_NEW_HOLE		0x10

#define BRCMF_RXREORDER_NEW_HOLE		0x10





#define BRCMF_BSSIDX_INVALID			-1



/* Error bits */

/* Error bits */

int brcmf_msg_level;

int brcmf_msg_level;

module_param_named(debug, brcmf_msg_level, int, S_IRUSR | S_IWUSR);

module_param_named(debug, brcmf_msg_level, int, S_IRUSR | S_IWUSR);
@@ -837,6 +839,7 @@ 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 */

		/* store mapping ifidx to bssidx */

		if (drvr->if2bss[ifidx] == BRCMF_BSSIDX_INVALID)

			drvr->if2bss[ifidx] = bssidx;

			drvr->if2bss[ifidx] = bssidx;

	}

	}
@@ -862,15 +865,15 @@ 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);

		return;

		return;

	}

	}

	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 (drvr->if2bss[ifp->ifidx] == bssidx)

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

	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) 
{

{

	struct brcmf_pub *drvr = NULL;

	struct brcmf_pub *drvr = NULL;

	int ret = 0;

	int ret = 0;

	int i;





	brcmf_dbg(TRACE, "Enter\n");

	brcmf_dbg(TRACE, "Enter\n");
@@ -934,7 +938,9 @@ int brcmf_attach(struct device *dev) 
	if (!drvr)

	if (!drvr)

		return -ENOMEM;

		return -ENOMEM;





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

	for (i = 0; i < ARRAY_SIZE(drvr->if2bss); i++)

		drvr->if2bss[i] = BRCMF_BSSIDX_INVALID;



	mutex_init(&drvr->proto_block);

	mutex_init(&drvr->proto_block);





	/* Link to bus module */

	/* Link to bus module */