[PATCH 3.1-stable] staging: brcm80211: fix for rate index in receive status

[PATCH 3.1-stable] staging: brcm80211: fix for rate index in receive status

[Arend van Spriel]

This fix resolves an issue on 5GHz as posted on LKML:

BUG: All network processes hang (brcmsmac/wpa_supplicant)
ID: <20111018111422.GA1979@schottelius.org>

Cc: stable@kernel.org
Reported-by: Nico Schottelius <nico-linux-20111017@schottelius.org>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
---
Hi Greg,

This change is in the mainline brcmsmac driver, but I do not have a commit
message to refer to as we transitioned from staging to mainline in the last
merge window. Can you process this patch without that info?

Gr. AvS
---
 drivers/staging/brcm80211/brcmsmac/mac80211_if.h |    6 ++++++
 drivers/staging/brcm80211/brcmsmac/main.c        |    8 ++++++++
 2 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/drivers/staging/brcm80211/brcmsmac/mac80211_if.h b/drivers/staging/brcm80211/brcmsmac/mac80211_if.h
index 40e3d37..3be8655 100644
--- a/drivers/staging/brcm80211/brcmsmac/mac80211_if.h
+++ b/drivers/staging/brcm80211/brcmsmac/mac80211_if.h
@@ -20,6 +20,12 @@
 #include <linux/timer.h>
 #include <linux/interrupt.h>
 
+/*
+ * Starting index for 5G rates in the
+ * legacy rate table.
+ */
+#define BRCMS_LEGACY_5G_RATE_OFFSET	4
+
 /* softmac ioctl definitions */
 #define BRCMS_SET_SHORTSLOT_OVERRIDE		146
 
diff --git a/drivers/staging/brcm80211/brcmsmac/main.c b/drivers/staging/brcm80211/brcmsmac/main.c
index 1763c45..9654163 100644
--- a/drivers/staging/brcm80211/brcmsmac/main.c
+++ b/drivers/staging/brcm80211/brcmsmac/main.c
@@ -4608,6 +4608,14 @@ prep_mac80211_status(struct brcms_c_info *wlc, struct d11rxhdr *rxh,
 			wiphy_err(wlc->wiphy, "%s: Unknown rate\n", __func__);
 		}
 
+		/*
+		 * For 5GHz, we should decrease the index as it is
+		 * a subset of the 2.4G rates. See bitrates field
+		 * of brcms_band_5GHz_nphy (in mac80211_if.c).
+		 */
+		if (rx_status->band == IEEE80211_BAND_5GHZ)
+			rx_status->rate_idx -= BRCMS_LEGACY_5G_RATE_OFFSET;
+
 		/* Determine short preamble and rate_idx */
 		preamble = 0;
 		if (IS_CCK(rspec)) {
-- 
1.7.5.4

Re: [PATCH 3.1-stable] staging: brcm80211: fix for rate index in receive status

[Greg KH]

On Thu, Nov 10, 2011 at 10:48:34AM +0100, Arend van Spriel wrote:
> This fix resolves an issue on 5GHz as posted on LKML:
> 
> BUG: All network processes hang (brcmsmac/wpa_supplicant)
> ID: <20111018111422.GA1979@schottelius.org>

What are these tags for?  I've not seen them in kernel patches before.

> Cc: stable@kernel.org

Wrong address, please use stable@vger.kernel.org now.

> Reported-by: Nico Schottelius <nico-linux-20111017@schottelius.org>
> Signed-off-by: Arend van Spriel <arend@broadcom.com>
> ---
> Hi Greg,
> 
> This change is in the mainline brcmsmac driver, but I do not have a commit
> message to refer to as we transitioned from staging to mainline in the last
> merge window. Can you process this patch without that info?

No, I need the git commit id of the patch that fixed this in Linus's
tree, if the files are different due to the move, that's fine, but I
still need this to reference.

greg k-h

Re: [PATCH 3.1-stable] staging: brcm80211: fix for rate index in receive status

[Arend van Spriel]

On 11/10/2011 04:17 PM, Greg KH wrote:
> On Thu, Nov 10, 2011 at 10:48:34AM +0100, Arend van Spriel wrote:
>> This fix resolves an issue on 5GHz as posted on LKML:
>>
>> BUG: All network processes hang (brcmsmac/wpa_supplicant)
>> ID: <20111018111422.GA1979@schottelius.org>
> 
> What are these tags for?  I've not seen them in kernel patches before.
> 

The first line was the email Subject as posted on LKML. The second is
the message id.

>> Cc: stable@kernel.org
> 
> Wrong address, please use stable@vger.kernel.org now.
> 

Noted.

>> Reported-by: Nico Schottelius <nico-linux-20111017@schottelius.org>
>> Signed-off-by: Arend van Spriel <arend@broadcom.com>
>> ---
>> Hi Greg,
>>
>> This change is in the mainline brcmsmac driver, but I do not have a commit
>> message to refer to as we transitioned from staging to mainline in the last
>> merge window. Can you process this patch without that info?
> 
> No, I need the git commit id of the patch that fixed this in Linus's
> tree, if the files are different due to the move, that's fine, but I
> still need this to reference.
> 

Here it is:

commit 5a84d6ad4c9306afb467a600a4c6d7b50da49440
Author: Arend van Spriel <arend@broadcom.com>
Date:   Tue Aug 23 14:14:00 2011 +0200

    staging: brcm80211: fill in proper rx rate in mac80211 rx status

    The brcmsmac driver supports different rates on 5GHz but this is not
    taken into account when providing the rate index in the receive
    status information passed to mac80211.

    Reviewed-by: Roland Vossen <rvossen@broadcom.com>
    Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
    Reviewed-by: Henry Ptasinski <henryp@broadcom.com>
    Signed-off-by: Arend van Spriel <arend@broadcom.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Gr. AvS

Re: [PATCH 3.1-stable] staging: brcm80211: fix for rate index in receive status

[Greg KH]

On Thu, Nov 10, 2011 at 07:37:10PM +0100, Arend van Spriel wrote:
> On 11/10/2011 04:17 PM, Greg KH wrote:
> > On Thu, Nov 10, 2011 at 10:48:34AM +0100, Arend van Spriel wrote:
> >> This fix resolves an issue on 5GHz as posted on LKML:
> >>
> >> BUG: All network processes hang (brcmsmac/wpa_supplicant)
> >> ID: <20111018111422.GA1979@schottelius.org>
> > 
> > What are these tags for?  I've not seen them in kernel patches before.
> > 
> 
> The first line was the email Subject as posted on LKML. The second is
> the message id.

Neither of those are something we normally put in changelog comments,
right?

> >> Cc: stable@kernel.org
> > 
> > Wrong address, please use stable@vger.kernel.org now.
> > 
> 
> Noted.
> 
> >> Reported-by: Nico Schottelius <nico-linux-20111017@schottelius.org>
> >> Signed-off-by: Arend van Spriel <arend@broadcom.com>
> >> ---
> >> Hi Greg,
> >>
> >> This change is in the mainline brcmsmac driver, but I do not have a commit
> >> message to refer to as we transitioned from staging to mainline in the last
> >> merge window. Can you process this patch without that info?
> > 
> > No, I need the git commit id of the patch that fixed this in Linus's
> > tree, if the files are different due to the move, that's fine, but I
> > still need this to reference.
> > 
> 
> Here it is:
> 
> commit 5a84d6ad4c9306afb467a600a4c6d7b50da49440
> Author: Arend van Spriel <arend@broadcom.com>
> Date:   Tue Aug 23 14:14:00 2011 +0200
> 
>     staging: brcm80211: fill in proper rx rate in mac80211 rx status
> 
>     The brcmsmac driver supports different rates on 5GHz but this is not
>     taken into account when providing the rate index in the receive
>     status information passed to mac80211.
> 
>     Reviewed-by: Roland Vossen <rvossen@broadcom.com>
>     Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
>     Reviewed-by: Henry Ptasinski <henryp@broadcom.com>
>     Signed-off-by: Arend van Spriel <arend@broadcom.com>
>     Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Thanks, that's what I need.  I'll queue this up for the next 3.1 kernel
after this one gets out later this week.

greg k-h

Re: [PATCH 3.1-stable] staging: brcm80211: fix for rate index in receive status

[Arend van Spriel]

On 11/10/2011 07:44 PM, Greg KH wrote:
> On Thu, Nov 10, 2011 at 07:37:10PM +0100, Arend van Spriel wrote:
>> On 11/10/2011 04:17 PM, Greg KH wrote:
>>
>> Here it is:
>>
>> commit 5a84d6ad4c9306afb467a600a4c6d7b50da49440
>> Author: Arend van Spriel <arend@broadcom.com>
>> Date:   Tue Aug 23 14:14:00 2011 +0200
>>
>>     staging: brcm80211: fill in proper rx rate in mac80211 rx status
>>
>>     The brcmsmac driver supports different rates on 5GHz but this is not
>>     taken into account when providing the rate index in the receive
>>     status information passed to mac80211.
>>
>>     Reviewed-by: Roland Vossen <rvossen@broadcom.com>
>>     Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
>>     Reviewed-by: Henry Ptasinski <henryp@broadcom.com>
>>     Signed-off-by: Arend van Spriel <arend@broadcom.com>
>>     Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
> 
> Thanks, that's what I need.  I'll queue this up for the next 3.1 kernel
> after this one gets out later this week.
> 
> greg k-h
> 

Fine by me.

Gr. AvS