diff options
| author | Hante Meuleman <meuleman@broadcom.com> | 2013-02-08 15:53:56 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-02-08 14:51:41 -0500 |
| commit | 1bc7c654a946dca4890f6bf29d769a7ed25eb8b0 (patch) | |
| tree | 50f7125dc5c4991fced0b1bffda833b79f68212e | |
| parent | cdcef36b3fe27c24f8e2cc22d256bcde88018ea4 (diff) | |
| download | linux-3.10-1bc7c654a946dca4890f6bf29d769a7ed25eb8b0.tar.gz linux-3.10-1bc7c654a946dca4890f6bf29d769a7ed25eb8b0.tar.bz2 linux-3.10-1bc7c654a946dca4890f6bf29d769a7ed25eb8b0.zip | |
brcmfmac: Reject change vif for p2p if.
Reviewed-by: Arend Van Spriel <arend@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c index 58b24373d6c..cba2f34d4c2 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c @@ -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; |