From e8d4d538fcfa5a993ac9c6eef35d0215a601cf7b Mon Sep 17 00:00:00 2001
From: Hante Meuleman <meuleman@broadcom.com>
Date: Fri, 8 Feb 2013 15:53:57 +0100
Subject: [PATCH] --- yaml --- r: 352623 b: refs/heads/master c:
 dded3d532cbea8b96ae388b9bc173f1b2ec4d292 h: refs/heads/master i:   352621:
 31bcd58612cd6bbb68a4a35b7a0a50db4b354fbe   352619:
 4f187fb6db3326bc76f292319ac2a6c299971c0e   352615:
 4cac8979fed1e0a6b9ba6efa4ae8d3c09df1d699   352607:
 9b80e872ad86d92a3cd004f5d1362a00ca6b704e v: v3

---
 [refs]                                                |  2 +-
 trunk/drivers/net/wireless/brcm80211/brcmfmac/p2p.c   |  2 +-
 .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c     | 11 ++++++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 6118b82e98ce..0b27838cf6dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1bc7c654a946dca4890f6bf29d769a7ed25eb8b0
+refs/heads/master: dded3d532cbea8b96ae388b9bc173f1b2ec4d292
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/p2p.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
index 9f87a8570770..fd090745b82f 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
+++ b/trunk/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/trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
index cba2f34d4c27..e7ef8270726a 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
@@ -4163,11 +4163,15 @@ 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) |
@@ -4176,7 +4180,7 @@ static const struct ieee80211_iface_limit brcmf_iface_limits[] = {
 };
 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;