netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] bcm43xx: Readd dropped assignment
@ 2006-10-17 23:12 Daniel Drake
  2006-10-18 14:40 ` Michael Buesch
  0 siblings, 1 reply; 5+ messages in thread
From: Daniel Drake @ 2006-10-17 23:12 UTC (permalink / raw)
  To: linville; +Cc: mb, Larry.Finger, netdev

Larry Finger pointed out a problem with my ieee80211 IV/ICV stripping patch,
which I forgot about. Sorry about that.

The patch readds the frame_ctl assignment which was accidently dropped.

Signed-off-by: Daniel Drake <dsd@gentoo.org>

Index: linux/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
===================================================================
--- linux.orig/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
+++ linux/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
@@ -543,6 +543,7 @@ int bcm43xx_rx(struct bcm43xx_private *b
 		break;
 	}
 
+	frame_ctl = le16_to_cpu(wlhdr->frame_ctl);
 	switch (WLAN_FC_GET_TYPE(frame_ctl)) {
 	case IEEE80211_FTYPE_MGMT:
 		ieee80211_rx_mgt(bcm->ieee, wlhdr, &stats);

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] bcm43xx: Readd dropped assignment
  2006-10-17 23:12 [PATCH] bcm43xx: Readd dropped assignment Daniel Drake
@ 2006-10-18 14:40 ` Michael Buesch
  2006-10-18 21:10   ` Larry Finger
  2006-10-21  3:29   ` Dave Jones
  0 siblings, 2 replies; 5+ messages in thread
From: Michael Buesch @ 2006-10-18 14:40 UTC (permalink / raw)
  To: linville; +Cc: Daniel Drake, Larry.Finger, netdev

On Wednesday 18 October 2006 01:12, Daniel Drake wrote:
> Larry Finger pointed out a problem with my ieee80211 IV/ICV stripping patch,
> which I forgot about. Sorry about that.
> 
> The patch readds the frame_ctl assignment which was accidently dropped.
> 
> Signed-off-by: Daniel Drake <dsd@gentoo.org>

Whoops. Please merge this as fast as possible, John.
That's a real bug which prevents RX from working.

Signed-off-by: Michael Buesch <mb@bu3sch.de>

> Index: linux/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
> ===================================================================
> --- linux.orig/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
> +++ linux/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
> @@ -543,6 +543,7 @@ int bcm43xx_rx(struct bcm43xx_private *b
>  		break;
>  	}
>  
> +	frame_ctl = le16_to_cpu(wlhdr->frame_ctl);
>  	switch (WLAN_FC_GET_TYPE(frame_ctl)) {
>  	case IEEE80211_FTYPE_MGMT:
>  		ieee80211_rx_mgt(bcm->ieee, wlhdr, &stats);
> 

-- 
Greetings Michael.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] bcm43xx: Readd dropped assignment
  2006-10-18 14:40 ` Michael Buesch
@ 2006-10-18 21:10   ` Larry Finger
  2006-10-21  3:29   ` Dave Jones
  1 sibling, 0 replies; 5+ messages in thread
From: Larry Finger @ 2006-10-18 21:10 UTC (permalink / raw)
  To: Michael Buesch; +Cc: linville, Daniel Drake, netdev

Michael Buesch wrote:
> On Wednesday 18 October 2006 01:12, Daniel Drake wrote:
>> Larry Finger pointed out a problem with my ieee80211 IV/ICV stripping patch,
>> which I forgot about. Sorry about that.
>>
>> The patch readds the frame_ctl assignment which was accidently dropped.
>>
>> Signed-off-by: Daniel Drake <dsd@gentoo.org>
> 
> Whoops. Please merge this as fast as possible, John.
> That's a real bug which prevents RX from working.
> 
> Signed-off-by: Michael Buesch <mb@bu3sch.de>

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

> 
>> Index: linux/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
>> ===================================================================
>> --- linux.orig/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
>> +++ linux/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
>> @@ -543,6 +543,7 @@ int bcm43xx_rx(struct bcm43xx_private *b
>>  		break;
>>  	}
>>  
>> +	frame_ctl = le16_to_cpu(wlhdr->frame_ctl);
>>  	switch (WLAN_FC_GET_TYPE(frame_ctl)) {
>>  	case IEEE80211_FTYPE_MGMT:
>>  		ieee80211_rx_mgt(bcm->ieee, wlhdr, &stats);
>>
> 


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] bcm43xx: Readd dropped assignment
  2006-10-18 14:40 ` Michael Buesch
  2006-10-18 21:10   ` Larry Finger
@ 2006-10-21  3:29   ` Dave Jones
  2006-10-21  3:42     ` Daniel Drake
  1 sibling, 1 reply; 5+ messages in thread
From: Dave Jones @ 2006-10-21  3:29 UTC (permalink / raw)
  To: Michael Buesch; +Cc: linville, Daniel Drake, Larry.Finger, netdev

On Wed, Oct 18, 2006 at 04:40:00PM +0200, Michael Buesch wrote:
 > On Wednesday 18 October 2006 01:12, Daniel Drake wrote:
 > > Larry Finger pointed out a problem with my ieee80211 IV/ICV stripping patch,
 > > which I forgot about. Sorry about that.
 > > 
 > > The patch readds the frame_ctl assignment which was accidently dropped.
 > > 
 > > Signed-off-by: Daniel Drake <dsd@gentoo.org>
 > 
 > Whoops. Please merge this as fast as possible, John.
 > That's a real bug which prevents RX from working.

Is that one for -stable too? That file looks similar enough
between .18.1 and .19rc that it should be the case ?

	Dave

-- 
http://www.codemonkey.org.uk

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] bcm43xx: Readd dropped assignment
  2006-10-21  3:29   ` Dave Jones
@ 2006-10-21  3:42     ` Daniel Drake
  0 siblings, 0 replies; 5+ messages in thread
From: Daniel Drake @ 2006-10-21  3:42 UTC (permalink / raw)
  To: Dave Jones; +Cc: Michael Buesch, linville, Larry.Finger, netdev

Dave Jones wrote:
> Is that one for -stable too? That file looks similar enough
> between .18.1 and .19rc that it should be the case ?

No. The IV/ICV stripping change was only merged into John's tree very 
recently (the day I sent the fix).

Daniel

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2006-10-21  3:43 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-10-17 23:12 [PATCH] bcm43xx: Readd dropped assignment Daniel Drake
2006-10-18 14:40 ` Michael Buesch
2006-10-18 21:10   ` Larry Finger
2006-10-21  3:29   ` Dave Jones
2006-10-21  3:42     ` Daniel Drake

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).