From 1316f52200b3a14f16762dd94db6ad4c640da3a6 Mon Sep 17 00:00:00 2001
From: Arend van Spriel <arend@broadcom.com>
Date: Thu, 4 Apr 2013 12:10:11 +0200
Subject: [PATCH] --- yaml --- r: 362639 b: refs/heads/master c:
 1527c343c12f3a2aae532aa881d12c6fbf8749f4 h: refs/heads/master i:   362637:
 ad3d8a57634747d2cb25f8885af000b45affc57e   362635:
 9a30e9f8056c9ba155883cb57b1fc36b6f1a1e3b   362631:
 d42571ff379140485cf0503de57dca5a6747dbe2   362623:
 118577428858f94e228d1547aa58139912a045d3 v: v3

---
 [refs]                                                     | 2 +-
 .../drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c  | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 1345090ecca0..164a6587b0d4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 319e7bd96aca64a478f3aad40711c928405b8b77
+refs/heads/master: 1527c343c12f3a2aae532aa881d12c6fbf8749f4
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
index ec46ffff5409..78da3eff75e8 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
@@ -4126,10 +4126,6 @@ static const struct ieee80211_iface_limit brcmf_iface_limits[] = {
 			 BIT(NL80211_IFTYPE_ADHOC) |
 			 BIT(NL80211_IFTYPE_AP)
 	},
-	{
-		.max = 1,
-		.types = BIT(NL80211_IFTYPE_P2P_DEVICE)
-	},
 	{
 		.max = 1,
 		.types = BIT(NL80211_IFTYPE_P2P_CLIENT) |
@@ -4187,8 +4183,7 @@ 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_DEVICE);
+				 BIT(NL80211_IFTYPE_P2P_GO);
 	wiphy->iface_combinations = brcmf_iface_combos;
 	wiphy->n_iface_combinations = ARRAY_SIZE(brcmf_iface_combos);
 	wiphy->bands[IEEE80211_BAND_2GHZ] = &__wl_band_2ghz;