Hendrik Sattler wrote:
> Am Donnerstag 02 November 2006 19:46 schrieb Larry Finger:
>> Index: wireless-dev/drivers/net/wireless/d80211/bcm43xx/bcm43xx_xmit.c
>> ===================================================================
>> --- wireless-dev.orig/drivers/net/wireless/d80211/bcm43xx/bcm43xx_xmit.c
>> +++ wireless-dev/drivers/net/wireless/d80211/bcm43xx/bcm43xx_xmit.c
>> @@ -678,10 +678,12 @@ void bcm43xx_rx(struct bcm43xx_private *
>>              status.flag |= RX_FLAG_DECRYPTED;
>>      }
>>
>> -    status.ssi = bcm43xx_rssi_postprocess(bcm, jssi,
>> +    status.signal = bcm43xx_rssi_postprocess(bcm, jssi,
>>                                            (phystat0 & 
>> BCM43xx_RX_PHYST0_OFDM),
>>                                            (phystat0 & 
>> BCM43xx_RX_PHYST0_GAINCTL),
>>                                            (phystat3 & 
>> BCM43xx_RX_PHYST3_TRSTATE));
>> +    status.noise = bcm->stats.link_noise;
>> +    status.ssi = jssi;
>>      if (phystat0 & BCM43xx_RX_PHYST0_OFDM)
>>              status.rate = bcm43xx_plcp_get_bitrate_ofdm(plcp);
>>      else
> 
> This part does not apply to current wireless-dev (from today):
> patching file drivers/net/wireless/d80211/bcm43xx/bcm43xx.h
> Hunk #2 succeeded at 567 (offset -45 lines).
> patching file drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.c
> Hunk #1 succeeded at 1083 (offset -116 lines).
> Hunk #2 succeeded at 3833 with fuzz 2 (offset -140 lines).
> patching file drivers/net/wireless/d80211/bcm43xx/bcm43xx_xmit.c
> Hunk #1 FAILED at 678.
> 1 out of 1 hunk FAILED -- saving rejects to file 
> drivers/net/wireless/d80211/bcm43xx/bcm43xx_xmit.c.rej
> 
> 
> It's easily adjustable,though :)
> Thanks, I'll try it and see what network-manager now thinks about it.

I think the reason is that I had pulled changes that Michael had sent to John 
in te past week. If 
those are applied first, mine should apply cleanly.

Larry
_______________________________________________
Bcm43xx-dev mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/bcm43xx-dev

Reply via email to