Regression in latest wireless-2.6: commit 43c8321e breaks rate control

Regression in latest wireless-2.6: commit 43c8321e breaks rate control

[Larry Finger]

Commit 43c8321e breaks rate control, and my b43 device, on wireless-2.6/everything. The hack below
fixes it:

Index: wireless-2.6/net/mac80211/Kconfig
===================================================================
--- wireless-2.6.orig/net/mac80211/Kconfig
+++ wireless-2.6/net/mac80211/Kconfig
@@ -16,7 +16,7 @@ config MAC80211
 config MAC80211_RCSIMPLE
        bool "'simple' rate control algorithm"
        default y
-       depends on MAC80211 && EMBEDDED
+       depends on MAC80211
        help
          This option allows you to turn off the 'simple' rate
          control algorithm in mac80211. If you do turn it off,

On my system, the symbol EMBEDDED is not defined, thus rcsimple, the only rate-control mechanism I
need to use, is not built.

Larry

Re: Regression in latest wireless-2.6: commit 43c8321e breaks rate control

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 979 bytes --]


On Wed, 2007-11-07 at 09:29 -0600, Larry Finger wrote:
> Commit 43c8321e breaks rate control, and my b43 device, on wireless-2.6/everything. The hack below
> fixes it:
> 
> Index: wireless-2.6/net/mac80211/Kconfig
> ===================================================================
> --- wireless-2.6.orig/net/mac80211/Kconfig
> +++ wireless-2.6/net/mac80211/Kconfig
> @@ -16,7 +16,7 @@ config MAC80211
>  config MAC80211_RCSIMPLE
>         bool "'simple' rate control algorithm"
>         default y
> -       depends on MAC80211 && EMBEDDED
> +       depends on MAC80211
>         help
>           This option allows you to turn off the 'simple' rate
>           control algorithm in mac80211. If you do turn it off,
> 
> On my system, the symbol EMBEDDED is not defined, thus rcsimple, the only rate-control mechanism I
> need to use, is not built.

Ahrg. I'm stupid. I meant for this to be only selectable on EMBEDDED.
How do I do that?

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]

[PATCH] mac80211: fix MAC80211_RCSIMPLE Kconfig

[Johannes Berg]

I meant for this to be selectable only with EMBEDDED, not enabled only
with EMBEDDED. This does it that way. Sorry.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
---
 net/mac80211/Kconfig |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- everything.orig/net/mac80211/Kconfig	2007-11-07 16:38:57.779051161 +0100
+++ everything/net/mac80211/Kconfig	2007-11-07 16:39:06.949024631 +0100
@@ -14,9 +14,9 @@ config MAC80211
 	networking stack.
 
 config MAC80211_RCSIMPLE
-	bool "'simple' rate control algorithm"
+	bool "'simple' rate control algorithm" if EMBEDDED
 	default y
-	depends on MAC80211 && EMBEDDED
+	depends on MAC80211
 	help
 	  This option allows you to turn off the 'simple' rate
 	  control algorithm in mac80211. If you do turn it off,

Re: [PATCH] mac80211: fix MAC80211_RCSIMPLE Kconfig

[Larry Finger]

Johannes Berg wrote:
> I meant for this to be selectable only with EMBEDDED, not enabled only
> with EMBEDDED. This does it that way. Sorry.
> 
> Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
> ---
>  net/mac80211/Kconfig |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> --- everything.orig/net/mac80211/Kconfig	2007-11-07 16:38:57.779051161 +0100
> +++ everything/net/mac80211/Kconfig	2007-11-07 16:39:06.949024631 +0100
> @@ -14,9 +14,9 @@ config MAC80211
>  	networking stack.
>  
>  config MAC80211_RCSIMPLE
> -	bool "'simple' rate control algorithm"
> +	bool "'simple' rate control algorithm" if EMBEDDED
>  	default y
> -	depends on MAC80211 && EMBEDDED
> +	depends on MAC80211
>  	help
>  	  This option allows you to turn off the 'simple' rate
>  	  control algorithm in mac80211. If you do turn it off,

This one works here. ACK for non-embedded system.

Larry