UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ath9k: advertise p2p dev support when chanctx 

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>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Janusz.Dziedzic@tieto.com 2015-07-21 11:11:40 +02:00 committed by Kalle Valo
parent c5bc15fce6
commit eb61f9f623
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/wireless/ath/ath9k/init.c
View File

@ -736,13 +736,14 @@ static const struct ieee80211_iface_limit if_limits_multi[] = {
BIT(NL80211_IFTYPE_P2P_CLIENT) | BIT(NL80211_IFTYPE_P2P_CLIENT) |
BIT(NL80211_IFTYPE_P2P_GO) }, BIT(NL80211_IFTYPE_P2P_GO) },
{ .max = 1, .types = BIT(NL80211_IFTYPE_ADHOC) }, { .max = 1, .types = BIT(NL80211_IFTYPE_ADHOC) },
{ .max = 1, .types = BIT(NL80211_IFTYPE_P2P_DEVICE) },
}; };
static const struct ieee80211_iface_combination if_comb_multi[] = { static const struct ieee80211_iface_combination if_comb_multi[] = {
{ {
.limits = if_limits_multi, .limits = if_limits_multi,
.n_limits = ARRAY_SIZE(if_limits_multi), .n_limits = ARRAY_SIZE(if_limits_multi),
.max_interfaces = 2, .max_interfaces = 3,
.num_different_channels = 2, .num_different_channels = 2,
.beacon_int_infra_match = true, .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_MESH_POINT) |
BIT(NL80211_IFTYPE_WDS); 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->iface_combinations = if_comb;
hw->wiphy->n_iface_combinations = ARRAY_SIZE(if_comb); hw->wiphy->n_iface_combinations = ARRAY_SIZE(if_comb);
} }