[PATCH] mac80211: allow selection of minstrel_ht as default rc algo

[PATCH] mac80211: allow selection of minstrel_ht as default rc algo

[Helmut Schaa]

Allow selection of minstrel_ht as default rate control algorithm. At the
moment minstrel_ht can only be requested by the driver code but not selected
as default in make menuconfig.

Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
---
 net/mac80211/Kconfig |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
index 83eec7a..3ad82cd 100644
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
@@ -64,6 +64,11 @@ config MAC80211_RC_DEFAULT_MINSTREL
 	---help---
 	  Select Minstrel as the default rate control algorithm.
 
+config MAC80211_RC_DEFAULT_MINSTREL_HT
+	bool "Minstrel HT"
+	depends on MAC80211_RC_MINSTREL_HT
+	---help---
+	  Select Minstrel HT as the default rate control algorithm.
 
 endchoice
 
@@ -71,6 +76,7 @@ config MAC80211_RC_DEFAULT
 	string
 	default "minstrel" if MAC80211_RC_DEFAULT_MINSTREL
 	default "pid" if MAC80211_RC_DEFAULT_PID
+	default "minstrel_ht" if MAC80211_RC_DEFAULT_MINSTREL_HT
 	default ""
 
 endif
-- 
1.6.4.2

Re: [PATCH] mac80211: allow selection of minstrel_ht as default rc algo

[Luis R. Rodriguez]

On Mon, Jun 21, 2010 at 1:59 AM, Helmut Schaa
<helmut.schaa@googlemail.com> wrote:
> Allow selection of minstrel_ht as default rate control algorithm. At the
> moment minstrel_ht can only be requested by the driver code but not selected
> as default in make menuconfig.
>
> Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>

Shouldn't this just be enabled when you enable minstrel? I don't get
why we would split up the two.

  Luis

Re: [PATCH] mac80211: allow selection of minstrel_ht as default rc algo

[Helmut Schaa]

Am Montag 21 Juni 2010 schrieb Luis R. Rodriguez:
> On Mon, Jun 21, 2010 at 1:59 AM, Helmut Schaa
> <helmut.schaa@googlemail.com> wrote:
> > Allow selection of minstrel_ht as default rate control algorithm. At the
> > moment minstrel_ht can only be requested by the driver code but not selected
> > as default in make menuconfig.
> >
> > Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
> 
> Shouldn't this just be enabled when you enable minstrel? I don't get
> why we would split up the two.

Would be fine for me as well. But I'm not sure if we want minstrel_ht already
as default and we want definitely keep the possibility to only select minstrel
(if compiling on an embedded system with just bg wifi for example).

Felix, any objections against selecting minstrel_ht as default if minstrel
was selected as default rc algo and minstrel_ht is compiled in?

In case of an embedded system without minstrel_ht minstrel would stay as default.

diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
index 83eec7a..4d6f865 100644
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
@@ -69,6 +69,7 @@ endchoice
 
 config MAC80211_RC_DEFAULT
 	string
+	default "minstrel_ht" if MAC80211_RC_DEFAULT_MINSTREL && MAC80211_RC_MINSTREL_HT
 	default "minstrel" if MAC80211_RC_DEFAULT_MINSTREL
 	default "pid" if MAC80211_RC_DEFAULT_PID
 	default ""

Thanks,
Helmut

Re: [PATCH] mac80211: allow selection of minstrel_ht as default rc algo

[Felix Fietkau]

On 2010-06-21 9:18 PM, Helmut Schaa wrote:
> Am Montag 21 Juni 2010 schrieb Luis R. Rodriguez:
>> On Mon, Jun 21, 2010 at 1:59 AM, Helmut Schaa
>> <helmut.schaa@googlemail.com> wrote:
>> > Allow selection of minstrel_ht as default rate control algorithm. At the
>> > moment minstrel_ht can only be requested by the driver code but not selected
>> > as default in make menuconfig.
>> >
>> > Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
>> 
>> Shouldn't this just be enabled when you enable minstrel? I don't get
>> why we would split up the two.
> 
> Would be fine for me as well. But I'm not sure if we want minstrel_ht already
> as default and we want definitely keep the possibility to only select minstrel
> (if compiling on an embedded system with just bg wifi for example).
> 
> Felix, any objections against selecting minstrel_ht as default if minstrel
> was selected as default rc algo and minstrel_ht is compiled in?
> 
> In case of an embedded system without minstrel_ht minstrel would stay as default.
> 
> diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
> index 83eec7a..4d6f865 100644
> --- a/net/mac80211/Kconfig
> +++ b/net/mac80211/Kconfig
> @@ -69,6 +69,7 @@ endchoice
>  
>  config MAC80211_RC_DEFAULT
>  	string
> +	default "minstrel_ht" if MAC80211_RC_DEFAULT_MINSTREL && MAC80211_RC_MINSTREL_HT
>  	default "minstrel" if MAC80211_RC_DEFAULT_MINSTREL
>  	default "pid" if MAC80211_RC_DEFAULT_PID
>  	default ""
Looks good, I think we should do it this way.

- Felix