--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-@@ -6207,29 +6207,15 @@ static int brcmf_setup_ifmodes(struct wi
+@@ -6208,29 +6208,15 @@ static int brcmf_setup_ifmodes(struct wi
if (!combo)
goto err;
c0_limits[i].max = 1;
c0_limits[i++].types = BIT(NL80211_IFTYPE_STATION);
if (p2p) {
-@@ -6247,6 +6233,7 @@ static int brcmf_setup_ifmodes(struct wi
+@@ -6248,6 +6234,7 @@ static int brcmf_setup_ifmodes(struct wi
c0_limits[i].max = 1;
c0_limits[i++].types = BIT(NL80211_IFTYPE_AP);
}
combo[c].max_interfaces = i;
combo[c].n_limits = i;
combo[c].limits = c0_limits;
-@@ -6254,7 +6241,9 @@ static int brcmf_setup_ifmodes(struct wi
+@@ -6255,7 +6242,9 @@ static int brcmf_setup_ifmodes(struct wi
if (p2p) {
c++;
i = 0;
p2p_limits[i].max = 1;
p2p_limits[i++].types = BIT(NL80211_IFTYPE_STATION);
p2p_limits[i].max = 1;
-@@ -6263,6 +6252,7 @@ static int brcmf_setup_ifmodes(struct wi
+@@ -6264,6 +6253,7 @@ static int brcmf_setup_ifmodes(struct wi
p2p_limits[i++].types = BIT(NL80211_IFTYPE_P2P_CLIENT);
p2p_limits[i].max = 1;
p2p_limits[i++].types = BIT(NL80211_IFTYPE_P2P_DEVICE);
combo[c].max_interfaces = i;
combo[c].n_limits = i;
combo[c].limits = p2p_limits;
-@@ -6270,14 +6260,19 @@ static int brcmf_setup_ifmodes(struct wi
+@@ -6271,14 +6261,19 @@ static int brcmf_setup_ifmodes(struct wi
if (mbss) {
c++;