Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-27 13:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

ath10k: tweak interface combinations

Browse Source 
Concurrent AP/GO operation on different channels
isn't really supported well by the firmware so
it's better to remove it from being advertised.

Also tune the way station and p2p client interface
limits are expressed to allow station + 2x p2p
client or station + p2p client + p2p go.

Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
This commit is contained in:
Michal Kazior 2015-07-09 13:08:39 +02:00 committed by Kalle Valo
parent acd0b27bb1
commit ed25b113a9
1 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
drivers/net/wireless/ath/ath10k/mac.c
View File

@ -6557,8 +6557,11 @@ static const struct ieee80211_iface_combination ath10k_10x_if_comb[] = {
static const struct ieee80211_iface_limit ath10k_tlv_if_limit[] = { static const struct ieee80211_iface_limit ath10k_tlv_if_limit[] = {
{ {
.max = 2, .max = 2,
.types = BIT(NL80211_IFTYPE_STATION) | .types = BIT(NL80211_IFTYPE_STATION),
BIT(NL80211_IFTYPE_AP) | },
{
.max = 2,
.types = BIT(NL80211_IFTYPE_AP) |
BIT(NL80211_IFTYPE_P2P_CLIENT) | BIT(NL80211_IFTYPE_P2P_CLIENT) |
BIT(NL80211_IFTYPE_P2P_GO), BIT(NL80211_IFTYPE_P2P_GO),
}, },
@ -6568,6 +6571,26 @@ static const struct ieee80211_iface_limit ath10k_tlv_if_limit[] = {
}, },
}; };
static const struct ieee80211_iface_limit ath10k_tlv_qcs_if_limit[] = {
{
.max = 2,
.types = BIT(NL80211_IFTYPE_STATION),
},
{
.max = 2,
.types = BIT(NL80211_IFTYPE_P2P_CLIENT),
},
{
.max = 1,
.types = BIT(NL80211_IFTYPE_AP) |
BIT(NL80211_IFTYPE_P2P_GO),
},
{
.max = 1,
.types = BIT(NL80211_IFTYPE_P2P_DEVICE),
},
};
static const struct ieee80211_iface_limit ath10k_tlv_if_limit_ibss[] = { static const struct ieee80211_iface_limit ath10k_tlv_if_limit_ibss[] = {
{ {
.max = 1, .max = 1,
@ -6586,7 +6609,7 @@ static struct ieee80211_iface_combination ath10k_tlv_if_comb[] = {
{ {
.limits = ath10k_tlv_if_limit, .limits = ath10k_tlv_if_limit,
.num_different_channels = 1, .num_different_channels = 1,
.max_interfaces = 3, .max_interfaces = 4,
.n_limits = ARRAY_SIZE(ath10k_tlv_if_limit), .n_limits = ARRAY_SIZE(ath10k_tlv_if_limit),
}, },
{ {
@ -6600,10 +6623,16 @@ static struct ieee80211_iface_combination ath10k_tlv_if_comb[] = {
static struct ieee80211_iface_combination ath10k_tlv_qcs_if_comb[] = { static struct ieee80211_iface_combination ath10k_tlv_qcs_if_comb[] = {
{ {
.limits = ath10k_tlv_if_limit, .limits = ath10k_tlv_if_limit,
.num_different_channels = 2, .num_different_channels = 1,
.max_interfaces = 3, .max_interfaces = 4,
.n_limits = ARRAY_SIZE(ath10k_tlv_if_limit), .n_limits = ARRAY_SIZE(ath10k_tlv_if_limit),
}, },
{
.limits = ath10k_tlv_qcs_if_limit,
.num_different_channels = 2,
.max_interfaces = 4,
.n_limits = ARRAY_SIZE(ath10k_tlv_qcs_if_limit),
},
{ {
.limits = ath10k_tlv_if_limit_ibss, .limits = ath10k_tlv_if_limit_ibss,
.num_different_channels = 1, .num_different_channels = 1,