2012-04-16 15:28:30

by Felix Fietkau

Subject: [PATCH] ath5k: add possible wiphy interface combinations

Signed-off-by: Felix Fietkau <[email protected]>
---
drivers/net/wireless/ath/ath5k/base.c | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
index 3007bba..2e385f5 100644
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -2415,6 +2415,19 @@ ath5k_tx_complete_poll_work(struct work_struct *work)
* Initialization routines *
\*************************/

+static const struct ieee80211_iface_limit if_limits[] = {
+ { .max = 256, .types = BIT(NL80211_IFTYPE_STATION) },
+ { .max = 4, .types = BIT(NL80211_IFTYPE_AP) |
+ BIT(NL80211_IFTYPE_MESH_POINT) },
+};
+
+static const struct ieee80211_iface_combination if_comb = {
+ .limits = if_limits,
+ .n_limits = ARRAY_SIZE(if_limits),
+ .max_interfaces = 256,
+ .num_different_channels = 1,
+};
+
int __devinit
ath5k_init_ah(struct ath5k_hw *ah, const struct ath_bus_ops *bus_ops)
{
@@ -2436,6 +2449,9 @@ ath5k_init_ah(struct ath5k_hw *ah, const struct ath_bus_ops *bus_ops)
BIT(NL80211_IFTYPE_ADHOC) |
BIT(NL80211_IFTYPE_MESH_POINT);

+ hw->wiphy->iface_combinations = &if_comb;
+ hw->wiphy->n_iface_combinations = 1;
+
/* SW support for IBSS_RSN is provided by mac80211 */
hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;

--
1.7.3.2

2012-04-16 16:11:09

by Ben Greear

Subject: Re: [PATCH] ath5k: add possible wiphy interface combinations

On 04/16/2012 09:07 AM, Felix Fietkau wrote:
> On 2012-04-16 6:02 PM, Ben Greear wrote:
>> On 04/16/2012 08:28 AM, Felix Fietkau wrote:
>>> Signed-off-by: Felix Fietkau<[email protected]>
>>> ---
>>> drivers/net/wireless/ath/ath5k/base.c | 16 ++++++++++++++++
>>> 1 files changed, 16 insertions(+), 0 deletions(-)
>>>
>>> diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
>>> index 3007bba..2e385f5 100644
>>> --- a/drivers/net/wireless/ath/ath5k/base.c
>>> +++ b/drivers/net/wireless/ath/ath5k/base.c
>>> @@ -2415,6 +2415,19 @@ ath5k_tx_complete_poll_work(struct work_struct *work)
>>> * Initialization routines *
>>> \*************************/
>>>
>>> +static const struct ieee80211_iface_limit if_limits[] = {
>>> + { .max = 256, .types = BIT(NL80211_IFTYPE_STATION) },
>>> + { .max = 4, .types = BIT(NL80211_IFTYPE_AP) |
>>> + BIT(NL80211_IFTYPE_MESH_POINT) },
>>> +};
>>
>> The station max is just an arbitrary number or is 256 really
>> the max it can handle? At least on ath9k, more are supported,
>> but I haven't tested ath5k lately....
> It is an arbitrary number.

I think the actual max for a channel (AP?) is somewhere around 2000, so maybe
make it 2048 just to make sure we are not adding artificial limitations?

Same with ath9k.

Thanks,
Ben

>
> - Felix


--
Ben Greear <[email protected]>
Candela Technologies Inc http://www.candelatech.com

2012-04-16 16:07:29

by Felix Fietkau

Subject: Re: [PATCH] ath5k: add possible wiphy interface combinations

On 2012-04-16 6:02 PM, Ben Greear wrote:
> On 04/16/2012 08:28 AM, Felix Fietkau wrote:
>> Signed-off-by: Felix Fietkau<[email protected]>
>> ---
>> drivers/net/wireless/ath/ath5k/base.c | 16 ++++++++++++++++
>> 1 files changed, 16 insertions(+), 0 deletions(-)
>>
>> diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
>> index 3007bba..2e385f5 100644
>> --- a/drivers/net/wireless/ath/ath5k/base.c
>> +++ b/drivers/net/wireless/ath/ath5k/base.c
>> @@ -2415,6 +2415,19 @@ ath5k_tx_complete_poll_work(struct work_struct *work)
>> * Initialization routines *
>> \*************************/
>>
>> +static const struct ieee80211_iface_limit if_limits[] = {
>> + { .max = 256, .types = BIT(NL80211_IFTYPE_STATION) },
>> + { .max = 4, .types = BIT(NL80211_IFTYPE_AP) |
>> + BIT(NL80211_IFTYPE_MESH_POINT) },
>> +};
>
> The station max is just an arbitrary number or is 256 really
> the max it can handle? At least on ath9k, more are supported,
> but I haven't tested ath5k lately....
It is an arbitrary number.

- Felix

2012-04-16 16:02:25

by Ben Greear

Subject: Re: [PATCH] ath5k: add possible wiphy interface combinations

On 04/16/2012 08:28 AM, Felix Fietkau wrote:
> Signed-off-by: Felix Fietkau<[email protected]>
> ---
> drivers/net/wireless/ath/ath5k/base.c | 16 ++++++++++++++++
> 1 files changed, 16 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
> index 3007bba..2e385f5 100644
> --- a/drivers/net/wireless/ath/ath5k/base.c
> +++ b/drivers/net/wireless/ath/ath5k/base.c
> @@ -2415,6 +2415,19 @@ ath5k_tx_complete_poll_work(struct work_struct *work)
> * Initialization routines *
> \*************************/
>
> +static const struct ieee80211_iface_limit if_limits[] = {
> + { .max = 256, .types = BIT(NL80211_IFTYPE_STATION) },
> + { .max = 4, .types = BIT(NL80211_IFTYPE_AP) |
> + BIT(NL80211_IFTYPE_MESH_POINT) },
> +};

The station max is just an arbitrary number or is 256 really
the max it can handle? At least on ath9k, more are supported,
but I haven't tested ath5k lately....

Thanks,
Ben

--
Ben Greear <[email protected]>
Candela Technologies Inc http://www.candelatech.com