diff mbox

[v3,1/4] ath9k: advertise p2p dev support when chanctx

Message ID 1437469903-32362-1-git-send-email-janusz.dziedzic@tieto.com (mailing list archive)
State Accepted
Delegated to: Kalle Valo
Headers show

Commit Message

Janusz.Dziedzic@tieto.com July 21, 2015, 9:11 a.m. UTC
Advertise p2p device support when ath9k loaded with
use_chanctx=1.

This will fix problem, when first interface is an AP
and next we would like to run p2p_find.
Before p2p find (scan phase) failed with EOPNOTSUPP.

Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
---
 drivers/net/wireless/ath/ath9k/init.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Comments

Kalle Valo Aug. 6, 2015, 7:11 a.m. UTC | #1
> Advertise p2p device support when ath9k loaded with
> use_chanctx=1.
> 
> This will fix problem, when first interface is an AP
> and next we would like to run p2p_find.
> Before p2p find (scan phase) failed with EOPNOTSUPP.
> 
> Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>

Thanks, 4 patches applied to wireless-drivers-next.git:

eb61f9f623f7 ath9k: advertise p2p dev support when chanctx
d83520b7cd6e ath9k: handle RoC cancel correctly
f3771c08282a ath9k: setup rxfilter for all chanctx
1738203ee729 ath9k: setup rxfilter when offchannel

Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index eff0e53..89a457d 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -736,13 +736,14 @@  static const struct ieee80211_iface_limit if_limits_multi[] = {
 				 BIT(NL80211_IFTYPE_P2P_CLIENT) |
 				 BIT(NL80211_IFTYPE_P2P_GO) },
 	{ .max = 1,	.types = BIT(NL80211_IFTYPE_ADHOC) },
+	{ .max = 1,	.types = BIT(NL80211_IFTYPE_P2P_DEVICE) },
 };
 
 static const struct ieee80211_iface_combination if_comb_multi[] = {
 	{
 		.limits = if_limits_multi,
 		.n_limits = ARRAY_SIZE(if_limits_multi),
-		.max_interfaces = 2,
+		.max_interfaces = 3,
 		.num_different_channels = 2,
 		.beacon_int_infra_match = true,
 	},
@@ -855,6 +856,10 @@  static void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
 			BIT(NL80211_IFTYPE_MESH_POINT) |
 			BIT(NL80211_IFTYPE_WDS);
 
+		if (ath9k_is_chanctx_enabled())
+			hw->wiphy->interface_modes |=
+					BIT(NL80211_IFTYPE_P2P_DEVICE);
+
 			hw->wiphy->iface_combinations = if_comb;
 			hw->wiphy->n_iface_combinations = ARRAY_SIZE(if_comb);
 	}