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

Commit 87c47903 authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville
Browse files

brcmfmac: handle IF event for P2P_DEVICE interface 



The firmware notifies about interface changes through the IF event
which has a NO_IF flag that means host can ignore the event. This
behaviour was introduced in the driver by:

  commit 2ee8382f
  Author: Arend van Spriel <arend@broadcom.com>
  Date:   Sat Aug 10 12:27:24 2013 +0200

      brcmfmac: ignore IF event if firmware indicates it

It turns out that the IF event for the P2P_DEVICE also has this
flag set, but the event should not be ignored in this scenario.
The mentioned commit caused a regression in 3.12 kernel in creation
of the P2P_DEVICE interface.

Cc: <stable@vger.kernel.org> # 3.14, 3.16
Reviewed-by: default avatarHante Meuleman <meuleman@broadcom.com>
Reviewed-by: default avatarFranky (Zhenhui) Lin <frankyl@broadcom.com>
Reviewed-by: default avatarDaniel (Deognyoun) Kim <dekim@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 avatarJohn W. Linville <linville@tuxdriver.com>
parent 8f2b4597

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

+9 −3
Original line number Diff line number Diff line
@@ -185,7 +185,13 @@ static void brcmf_fweh_handle_if_event(struct brcmf_pub *drvr, 
		  ifevent->action, ifevent->ifidx, ifevent->bssidx,

		  ifevent->flags, ifevent->role);



	if (ifevent->flags & BRCMF_E_IF_FLAG_NOIF) {

	/* The P2P Device interface event must not be ignored

	 * contrary to what firmware tells us. The only way to

	 * distinguish the P2P Device is by looking at the ifidx

	 * and bssidx received.

	 */

	if (!(ifevent->ifidx == 0 && ifevent->bssidx == 1) &&

	    (ifevent->flags & BRCMF_E_IF_FLAG_NOIF)) {

		brcmf_dbg(EVENT, "event can be ignored\n");

		return;

	}
@@ -210,12 +216,12 @@ static void brcmf_fweh_handle_if_event(struct brcmf_pub *drvr, 
				return;

	}



	if (ifevent->action == BRCMF_E_IF_CHANGE)

	if (ifp && ifevent->action == BRCMF_E_IF_CHANGE)

		brcmf_fws_reset_interface(ifp);



	err = brcmf_fweh_call_event_handler(ifp, emsg->event_code, emsg, data);



	if (ifevent->action == BRCMF_E_IF_DEL) {

	if (ifp && ifevent->action == BRCMF_E_IF_DEL) {

		brcmf_fws_del_interface(ifp);

		brcmf_del_if(drvr, ifevent->bssidx);

	}

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

+2 −0
Original line number Diff line number Diff line
@@ -172,6 +172,8 @@ enum brcmf_fweh_event_code { 
#define BRCMF_E_IF_ROLE_STA			0

#define BRCMF_E_IF_ROLE_AP			1

#define BRCMF_E_IF_ROLE_WDS			2

#define BRCMF_E_IF_ROLE_P2P_GO			3

#define BRCMF_E_IF_ROLE_P2P_CLIENT		4



/**

 * definitions for event packet validation.