* [PATCH] ath9k: Fix interface combinations for multi-channel concurrency
@ 2014-05-29 6:49 Rajkumar Manoharan
2014-05-29 7:18 ` Julian Calaby
0 siblings, 1 reply; 4+ messages in thread
From: Rajkumar Manoharan @ 2014-05-29 6:49 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, Rajkumar Manoharan
Currently mac80211 does not support WDS and DFS with channel context
drivers. So advertise these features only when the driver is not
supporting channel context and modparam "use_chanctx" is introduced
for preparing channel context support in ath9k.
Signed-off-by: Rajkumar Manoharan <rmanohar@qti.qualcomm.com>
---
drivers/net/wireless/ath/ath9k/init.c | 25 +++++++++++++++++++++----
1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index 1af7708..765a3c0 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -61,6 +61,10 @@ static int ath9k_ps_enable;
module_param_named(ps_enable, ath9k_ps_enable, int, 0444);
MODULE_PARM_DESC(ps_enable, "Enable WLAN PowerSave");
+static int ath9k_use_chanctx;
+module_param_named(use_chanctx, ath9k_use_chanctx, int, 0444);
+MODULE_PARM_DESC(use_chanctx, "Enable channel context for concurrency");
+
bool is_ath9k_unloaded;
#ifdef CONFIG_MAC80211_LEDS
@@ -646,8 +650,7 @@ static void ath9k_init_txpower_limits(struct ath_softc *sc)
}
static const struct ieee80211_iface_limit if_limits[] = {
- { .max = 2048, .types = BIT(NL80211_IFTYPE_STATION) |
- BIT(NL80211_IFTYPE_WDS) },
+ { .max = 2048, .types = BIT(NL80211_IFTYPE_STATION) },
{ .max = 8, .types =
#ifdef CONFIG_MAC80211_MESH
BIT(NL80211_IFTYPE_MESH_POINT) |
@@ -657,6 +660,10 @@ static const struct ieee80211_iface_limit if_limits[] = {
BIT(NL80211_IFTYPE_P2P_GO) },
};
+static const struct ieee80211_iface_limit wds_limits[] = {
+ { .max = 2048, .types = BIT(NL80211_IFTYPE_WDS) },
+};
+
static const struct ieee80211_iface_limit if_dfs_limits[] = {
{ .max = 1, .types = BIT(NL80211_IFTYPE_AP) |
#ifdef CONFIG_MAC80211_MESH
@@ -673,6 +680,13 @@ static const struct ieee80211_iface_combination if_comb[] = {
.num_different_channels = 1,
.beacon_int_infra_match = true,
},
+ {
+ .limits = wds_limits,
+ .n_limits = ARRAY_SIZE(if_limits),
+ .max_interfaces = 2048,
+ .num_different_channels = 1,
+ .beacon_int_infra_match = true,
+ },
#ifdef CONFIG_ATH9K_DFS_CERTIFIED
{
.limits = if_dfs_limits,
@@ -722,12 +736,15 @@ static void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
BIT(NL80211_IFTYPE_P2P_GO) |
BIT(NL80211_IFTYPE_P2P_CLIENT) |
BIT(NL80211_IFTYPE_AP) |
- BIT(NL80211_IFTYPE_WDS) |
BIT(NL80211_IFTYPE_STATION) |
BIT(NL80211_IFTYPE_ADHOC) |
BIT(NL80211_IFTYPE_MESH_POINT);
hw->wiphy->iface_combinations = if_comb;
- hw->wiphy->n_iface_combinations = ARRAY_SIZE(if_comb);
+ if (!ath9k_use_chanctx) {
+ hw->wiphy->n_iface_combinations = ARRAY_SIZE(if_comb);
+ hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_WDS);
+ } else
+ hw->wiphy->n_iface_combinations = 1;
}
hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
--
1.9.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] ath9k: Fix interface combinations for multi-channel concurrency
2014-05-29 6:49 [PATCH] ath9k: Fix interface combinations for multi-channel concurrency Rajkumar Manoharan
@ 2014-05-29 7:18 ` Julian Calaby
2014-05-29 9:33 ` Rajkumar Manoharan
0 siblings, 1 reply; 4+ messages in thread
From: Julian Calaby @ 2014-05-29 7:18 UTC (permalink / raw)
To: Rajkumar Manoharan; +Cc: John Linville, linux-wireless
Hi Rajkumar,
On Thu, May 29, 2014 at 4:49 PM, Rajkumar Manoharan
<rmanohar@qti.qualcomm.com> wrote:
> Currently mac80211 does not support WDS and DFS with channel context
> drivers. So advertise these features only when the driver is not
> supporting channel context and modparam "use_chanctx" is introduced
> for preparing channel context support in ath9k.
>
> Signed-off-by: Rajkumar Manoharan <rmanohar@qti.qualcomm.com>
> ---
> drivers/net/wireless/ath/ath9k/init.c | 25 +++++++++++++++++++++----
> 1 file changed, 21 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
> index 1af7708..765a3c0 100644
> --- a/drivers/net/wireless/ath/ath9k/init.c
> +++ b/drivers/net/wireless/ath/ath9k/init.c
> @@ -61,6 +61,10 @@ static int ath9k_ps_enable;
> module_param_named(ps_enable, ath9k_ps_enable, int, 0444);
> MODULE_PARM_DESC(ps_enable, "Enable WLAN PowerSave");
>
> +static int ath9k_use_chanctx;
> +module_param_named(use_chanctx, ath9k_use_chanctx, int, 0444);
> +MODULE_PARM_DESC(use_chanctx, "Enable channel context for concurrency");
> +
> bool is_ath9k_unloaded;
>
> #ifdef CONFIG_MAC80211_LEDS
> @@ -646,8 +650,7 @@ static void ath9k_init_txpower_limits(struct ath_softc *sc)
> }
>
> static const struct ieee80211_iface_limit if_limits[] = {
> - { .max = 2048, .types = BIT(NL80211_IFTYPE_STATION) |
> - BIT(NL80211_IFTYPE_WDS) },
> + { .max = 2048, .types = BIT(NL80211_IFTYPE_STATION) },
> { .max = 8, .types =
> #ifdef CONFIG_MAC80211_MESH
> BIT(NL80211_IFTYPE_MESH_POINT) |
> @@ -657,6 +660,10 @@ static const struct ieee80211_iface_limit if_limits[] = {
> BIT(NL80211_IFTYPE_P2P_GO) },
> };
>
> +static const struct ieee80211_iface_limit wds_limits[] = {
> + { .max = 2048, .types = BIT(NL80211_IFTYPE_WDS) },
> +};
> +
> static const struct ieee80211_iface_limit if_dfs_limits[] = {
> { .max = 1, .types = BIT(NL80211_IFTYPE_AP) |
> #ifdef CONFIG_MAC80211_MESH
> @@ -673,6 +680,13 @@ static const struct ieee80211_iface_combination if_comb[] = {
> .num_different_channels = 1,
> .beacon_int_infra_match = true,
> },
> + {
> + .limits = wds_limits,
> + .n_limits = ARRAY_SIZE(if_limits),
Shouldn't this be ARRAY_SIZE(wds_limits)?
> + .max_interfaces = 2048,
> + .num_different_channels = 1,
> + .beacon_int_infra_match = true,
> + },
> #ifdef CONFIG_ATH9K_DFS_CERTIFIED
> {
> .limits = if_dfs_limits,
> @@ -722,12 +736,15 @@ static void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
> BIT(NL80211_IFTYPE_P2P_GO) |
> BIT(NL80211_IFTYPE_P2P_CLIENT) |
> BIT(NL80211_IFTYPE_AP) |
> - BIT(NL80211_IFTYPE_WDS) |
> BIT(NL80211_IFTYPE_STATION) |
> BIT(NL80211_IFTYPE_ADHOC) |
> BIT(NL80211_IFTYPE_MESH_POINT);
> hw->wiphy->iface_combinations = if_comb;
> - hw->wiphy->n_iface_combinations = ARRAY_SIZE(if_comb);
> + if (!ath9k_use_chanctx) {
> + hw->wiphy->n_iface_combinations = ARRAY_SIZE(if_comb);
> + hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_WDS);
> + } else
> + hw->wiphy->n_iface_combinations = 1;
Is that right?
Thanks,
--
Julian Calaby
Email: julian.calaby@gmail.com
Profile: http://www.google.com/profiles/julian.calaby/
.Plan: http://sites.google.com/site/juliancalaby/
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ath9k: Fix interface combinations for multi-channel concurrency
2014-05-29 7:18 ` Julian Calaby
@ 2014-05-29 9:33 ` Rajkumar Manoharan
2014-05-29 10:39 ` Julian Calaby
0 siblings, 1 reply; 4+ messages in thread
From: Rajkumar Manoharan @ 2014-05-29 9:33 UTC (permalink / raw)
To: Julian Calaby; +Cc: John Linville, linux-wireless
On Thu, May 29, 2014 at 05:18:54PM +1000, Julian Calaby wrote:
> Hi Rajkumar,
>
> On Thu, May 29, 2014 at 4:49 PM, Rajkumar Manoharan
> <rmanohar@qti.qualcomm.com> wrote:
> > Currently mac80211 does not support WDS and DFS with channel context
> > drivers. So advertise these features only when the driver is not
> > supporting channel context and modparam "use_chanctx" is introduced
> > for preparing channel context support in ath9k.
> >
> > @@ -722,12 +736,15 @@ static void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
> > BIT(NL80211_IFTYPE_P2P_GO) |
> > BIT(NL80211_IFTYPE_P2P_CLIENT) |
> > BIT(NL80211_IFTYPE_AP) |
> > - BIT(NL80211_IFTYPE_WDS) |
> > BIT(NL80211_IFTYPE_STATION) |
> > BIT(NL80211_IFTYPE_ADHOC) |
> > BIT(NL80211_IFTYPE_MESH_POINT);
> > hw->wiphy->iface_combinations = if_comb;
> > - hw->wiphy->n_iface_combinations = ARRAY_SIZE(if_comb);
> > + if (!ath9k_use_chanctx) {
> > + hw->wiphy->n_iface_combinations = ARRAY_SIZE(if_comb);
> > + hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_WDS);
> > + } else
> > + hw->wiphy->n_iface_combinations = 1;
>
> Is that right?
>
Julian,
Right now mcc support is not implemented in ath9k and am working on that.
Once all channel context callbacks are added, iface_combinations will
refer to right interface set.
-Rajkumar
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ath9k: Fix interface combinations for multi-channel concurrency
2014-05-29 9:33 ` Rajkumar Manoharan
@ 2014-05-29 10:39 ` Julian Calaby
0 siblings, 0 replies; 4+ messages in thread
From: Julian Calaby @ 2014-05-29 10:39 UTC (permalink / raw)
To: Rajkumar Manoharan; +Cc: John Linville, linux-wireless
Hi Rajkumar,
On Thu, May 29, 2014 at 7:33 PM, Rajkumar Manoharan
<rmanohar@qti.qualcomm.com> wrote:
> On Thu, May 29, 2014 at 05:18:54PM +1000, Julian Calaby wrote:
>> Hi Rajkumar,
>>
>> On Thu, May 29, 2014 at 4:49 PM, Rajkumar Manoharan
>> <rmanohar@qti.qualcomm.com> wrote:
>> > Currently mac80211 does not support WDS and DFS with channel context
>> > drivers. So advertise these features only when the driver is not
>> > supporting channel context and modparam "use_chanctx" is introduced
>> > for preparing channel context support in ath9k.
>> >
>> > @@ -722,12 +736,15 @@ static void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
>> > BIT(NL80211_IFTYPE_P2P_GO) |
>> > BIT(NL80211_IFTYPE_P2P_CLIENT) |
>> > BIT(NL80211_IFTYPE_AP) |
>> > - BIT(NL80211_IFTYPE_WDS) |
>> > BIT(NL80211_IFTYPE_STATION) |
>> > BIT(NL80211_IFTYPE_ADHOC) |
>> > BIT(NL80211_IFTYPE_MESH_POINT);
>> > hw->wiphy->iface_combinations = if_comb;
>> > - hw->wiphy->n_iface_combinations = ARRAY_SIZE(if_comb);
>> > + if (!ath9k_use_chanctx) {
>> > + hw->wiphy->n_iface_combinations = ARRAY_SIZE(if_comb);
>> > + hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_WDS);
>> > + } else
>> > + hw->wiphy->n_iface_combinations = 1;
>>
>> Is that right?
>>
> Julian,
>
> Right now mcc support is not implemented in ath9k and am working on that.
> Once all channel context callbacks are added, iface_combinations will
> refer to right interface set.
I was referring to the n_iface_combinations = 1 line which doesn't
seem to match the size of if_comb.
Of course there's probably something subtle I'm missing =)
Thanks,
--
Julian Calaby
Email: julian.calaby@gmail.com
Profile: http://www.google.com/profiles/julian.calaby/
.Plan: http://sites.google.com/site/juliancalaby/
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-05-29 10:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-29 6:49 [PATCH] ath9k: Fix interface combinations for multi-channel concurrency Rajkumar Manoharan
2014-05-29 7:18 ` Julian Calaby
2014-05-29 9:33 ` Rajkumar Manoharan
2014-05-29 10:39 ` Julian Calaby
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.