--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-@@ -649,20 +649,24 @@ static struct wireless_dev *brcmf_cfg802
+@@ -670,20 +670,24 @@ static struct wireless_dev *brcmf_cfg802
return ERR_PTR(-EOPNOTSUPP);
case NL80211_IFTYPE_AP:
wdev = brcmf_ap_add_vif(wiphy, name, flags, params);
static void brcmf_scan_config_mpc(struct brcmf_if *ifp, int mpc)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
-@@ -2020,8 +2020,6 @@ static int brcmf_p2p_request_p2p_if(stru
+@@ -2030,8 +2030,6 @@ static int brcmf_p2p_request_p2p_if(stru
err = brcmf_fil_iovar_data_set(ifp, "p2p_ifadd", &if_request,
sizeof(if_request));