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

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

brcmfmac: Reject change vif for p2p if. 



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 cdcef36b

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

+12 −0
Original line number Diff line number Diff line
@@ -673,6 +673,18 @@ brcmf_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, 
		infra = 0;

		break;

	case NL80211_IFTYPE_STATION:

		/* Ignore change for p2p IF. Unclear why supplicant does this */

		if ((vif->wdev.iftype == NL80211_IFTYPE_P2P_CLIENT) ||

		    (vif->wdev.iftype == NL80211_IFTYPE_P2P_GO)) {

			brcmf_dbg(TRACE, "Ignoring cmd for p2p if\n");

			/* WAR: It is unexpected to get a change of VIF for P2P

			 * IF, but it happens. The request can not be handled

			 * but returning EPERM causes a crash. Returning 0

			 * without setting ieee80211_ptr->iftype causes trace

			 * (WARN_ON) but it works with wpa_supplicant

			 */

			return 0;

		}

		vif->mode = WL_MODE_BSS;

		infra = 1;

		break;