Skip to contentSkip to conversation

brcmfmac: announce P2P_DEVICE support in wiphy structure

PATCH New Arend van Spriel 1 participant 1 message May 14, 2013 Networking drivers (wireless)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 brcmfmac: announce P2P_DEVICE support in wiphy structure

P2P_DEVICE support was removed from brcmfmac for v3.9 kernel with the commit below:

commit 1527c343c12f3a2aae532aa881d12c6fbf8749f4

Author: Arend van Spriel <[email protected]>
Date:   Thu Apr 4 12:10:11 2013 +0200

brcmfmac: remove advertising P2P device support

However, it got merged into wireless-next. But for 3.10 brcmfmac does support P2P device. Putting it back with this commit.

---
Hi John,

Got started with 3.10-rc1 and found this 3.9 patch got merged.

Regards,
Arend

---
 drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +6 -1
index 6d758f2..761f501 100644
@@ -4140,6 +4140,10 @@ static const struct ieee80211_iface_limit brcmf_iface_limits[] = {
 		.types = BIT(NL80211_IFTYPE_P2P_CLIENT) |
 			 BIT(NL80211_IFTYPE_P2P_GO)
 	},
+	{
+		.max = 1,
+		.types = BIT(NL80211_IFTYPE_P2P_DEVICE)
+	}
 };
 static const struct ieee80211_iface_combination brcmf_iface_combos[] = {
 	{
@@ -4197,7 +4201,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;
Signature · 1 line
1.7.10.4