2 files changed, 9 insertions, 4 deletions

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
index 9f87a8570770..fd090745b82f 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
@@ -1320,7 +1320,7 @@ s32 brcmf_p2p_attach(struct brcmf_cfg80211_info *cfg)
         p2p->bss_idx[P2PAPI_BSSCFG_PRIMARY].vif = pri_ifp->vif;
 
         if (p2p_ifp) {
-                p2p_vif = brcmf_alloc_vif(cfg, NL80211_IFTYPE_STATION,
+                p2p_vif = brcmf_alloc_vif(cfg, NL80211_IFTYPE_P2P_DEVICE,
                                           false);
                 if (IS_ERR(p2p_vif)) {
                         brcmf_err("could not create discovery vif\n");
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
index cba2f34d4c27..e7ef8270726a 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
@@ -4163,20 +4163,24 @@ static void brcmf_wiphy_pno_params(struct wiphy *wiphy)
 
 static const struct ieee80211_iface_limit brcmf_iface_limits[] = {
         {
-                .max = 1,
+                .max = 2,
                 .types = BIT(NL80211_IFTYPE_STATION) |
                          BIT(NL80211_IFTYPE_ADHOC) |
                          BIT(NL80211_IFTYPE_AP)
         },
         {
                 .max = 1,
+                .types = BIT(NL80211_IFTYPE_P2P_DEVICE)
+        },
+        {
+                .max = 1,
                 .types = BIT(NL80211_IFTYPE_P2P_CLIENT) |
                          BIT(NL80211_IFTYPE_P2P_GO)
         },
 };
 static const struct ieee80211_iface_combination brcmf_iface_combos[] = {
         {
-                 .max_interfaces = BRCMF_IFACE_MAX_CNT - 1,
+                 .max_interfaces = BRCMF_IFACE_MAX_CNT,
                  .num_different_channels = 1, /* no multi-channel for now */
                  .n_limits = ARRAY_SIZE(brcmf_iface_limits),
                  .limits = brcmf_iface_limits
@@ -4225,7 +4229,8 @@ static struct wiphy *brcmf_setup_wiphy(struct device *phydev)
                                  BIT(NL80211_IFTYPE_ADHOC) |
                                  BIT(NL80211_IFTYPE_AP) |
                                  BIT(NL80211_IFTYPE_P2P_CLIENT) |
-                                 BIT(NL80211_IFTYPE_P2P_GO);
+                                 BIT(NL80211_IFTYPE_P2P_GO) |
+                                 BIT(NL80211_IFTYPE_P2P_DEVICE);
         wiphy->iface_combinations = brcmf_iface_combos;
         wiphy->n_iface_combinations = ARRAY_SIZE(brcmf_iface_combos);
         wiphy->bands[IEEE80211_BAND_2GHZ] = &__wl_band_2ghz;