Re: [Stable-review] [28/70] staging: brcm80211: bugfix for softmac crash on multi cpu configurations

[Ben Hutchings <ben@decadent.org.uk>]

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

On Tue, 2011-02-22 at 14:17 -0800, Greg KH wrote:
> 2.6.37-stable review patch.  If anyone has any objections, please let us know.
> 
> ------------------
> 
> From: Roland Vossen <rvossen@broadcom.com>
> 
> commit 6a3be6e6e7feb4cb35275475d6a863b748d59cc3 upstream.

The upstream commit looks completely different; the diffstat is:

 drivers/staging/brcm80211/sys/wl_mac80211.c  |   12 ++++++++++--
 drivers/staging/brcm80211/sys/wlc_mac80211.c |   13 +++++++++++++
 drivers/staging/brcm80211/sys/wlc_pub.h      |    2 ++
 3 files changed, 25 insertions(+), 2 deletions(-)

Why is this so different?

Ben.

[...]
>  drivers/staging/brcm80211/sys/wlc_mac80211.c |    1 -
>  1 file changed, 1 deletion(-)
> 
> --- a/drivers/staging/brcm80211/sys/wlc_mac80211.c
> +++ b/drivers/staging/brcm80211/sys/wlc_mac80211.c
> @@ -5336,7 +5336,6 @@ wlc_sendpkt_mac80211(wlc_info_t *wlc, vo
>  	fifo = prio2fifo[prio];
>  
>  	ASSERT((uint) PKTHEADROOM(sdu) >= TXOFF);
> -	ASSERT(!PKTSHARED(sdu));
>  	ASSERT(!PKTNEXT(sdu));
>  	ASSERT(!PKTLINK(sdu));
>  	ASSERT(fifo < NFIFO);

-- 
Ben Hutchings
Once a job is fouled up, anything done to improve it makes it worse.

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