2012-08-13 15:23:24

by Mohammed Shafi Shajakhan

Subject: [RFC 2/3] ath9k_htc: Advertise interface combinations supported

From: Mohammed Shafi Shajakhan <[email protected]>

This will allow us to create the multivif the driver supports.
Also this ensures the multivif support and limitation advertized
by the driver is taken care in cfg80211 itself.

Signed-off-by: Mohammed Shafi Shajakhan <[email protected]>
---
drivers/net/wireless/ath/ath9k/htc_drv_init.c | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
index a035a38..5022141 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
@@ -689,6 +689,21 @@ err_hw:
return ret;
}

+static const struct ieee80211_iface_limit if_limits[] = {
+ { .max = 2, .types = BIT(NL80211_IFTYPE_STATION) |
+ BIT(NL80211_IFTYPE_P2P_CLIENT) },
+ { .max = 2, .types =
+ BIT(NL80211_IFTYPE_AP) |
+ BIT(NL80211_IFTYPE_P2P_GO) },
+};
+
+static const struct ieee80211_iface_combination if_comb = {
+ .limits = if_limits,
+ .n_limits = ARRAY_SIZE(if_limits),
+ .max_interfaces = 2,
+ .num_different_channels = 1,
+};
+
static void ath9k_set_hw_capab(struct ath9k_htc_priv *priv,
struct ieee80211_hw *hw)
{
@@ -711,6 +726,9 @@ static void ath9k_set_hw_capab(struct ath9k_htc_priv *priv,
BIT(NL80211_IFTYPE_P2P_GO) |
BIT(NL80211_IFTYPE_P2P_CLIENT);

+ hw->wiphy->iface_combinations = &if_comb;
+ hw->wiphy->n_iface_combinations = 1;
+
hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;

hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN |
--
1.7.0.4

2012-08-13 15:41:21

by Sujith Manoharan

Subject: [RFC 2/3] ath9k_htc: Advertise interface combinations supported

Mohammed Shafi Shajakhan wrote:
> +static const struct ieee80211_iface_limit if_limits[] = {
> + { .max = 2, .types = BIT(NL80211_IFTYPE_STATION) |
> + BIT(NL80211_IFTYPE_P2P_CLIENT) },
> + { .max = 2, .types =
> + BIT(NL80211_IFTYPE_AP) |
> + BIT(NL80211_IFTYPE_P2P_GO) },
> +};

Well, P2P-GO/AP modes etc. are just broken in ath9k_htc.. but the patch could
go in, I guess. If you can fix the weird indentation. :)

Sujith

2012-08-14 05:02:31

by Mohammed Shafi Shajakhan

Subject: Re: [RFC 2/3] ath9k_htc: Advertise interface combinations supported

Hi Sujith,

On Monday 13 August 2012 09:07 PM, Sujith Manoharan wrote:
> Mohammed Shafi Shajakhan wrote:
>> +static const struct ieee80211_iface_limit if_limits[] = {
>> + { .max = 2, .types = BIT(NL80211_IFTYPE_STATION) |
>> + BIT(NL80211_IFTYPE_P2P_CLIENT) },
>> + { .max = 2, .types =
>> + BIT(NL80211_IFTYPE_AP) |
>> + BIT(NL80211_IFTYPE_P2P_GO) },
>> +};
>
> Well, P2P-GO/AP modes etc. are just broken in ath9k_htc.. but the patch could
> go in, I guess. If you can fix the weird indentation. :)
>

thanks for the review, i will fix that. The weird indentation may be
because i copied the code from init.c in ath9k :)
may be we could later fix P2P-GO/AP mode, concurrency in ath9k_htc!

--
thanks,
shafi