On 11/09/09 23:04, Gábor Stefanik wrote:
> On Mon, Nov 9, 2009 at 10:59 PM, Gertjan van Wingerde
> <gwingerde@xxxxxxxxx> wrote:
>> Allow rt2800usb to properly detect RT307X based devices, and set the appropriate chipset values.
>>
>> Signed-off-by: Gertjan van Wingede <gwingerde@xxxxxxxxx>
>> ---
>> drivers/net/wireless/rt2x00/rt2800usb.c | 21 ++++++++++++++-------
>> drivers/net/wireless/rt2x00/rt2x00.h | 1 +
>> 2 files changed, 15 insertions(+), 7 deletions(-)
>>
>> diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
>> index d22ab64..bd2f6e6 100644
>> --- a/drivers/net/wireless/rt2x00/rt2800usb.c
>> +++ b/drivers/net/wireless/rt2x00/rt2800usb.c
>> @@ -790,16 +790,19 @@ static int rt2800usb_init_eeprom(struct rt2x00_dev *rt2x00dev)
>> */
>> value = rt2x00_get_field16(eeprom, EEPROM_ANTENNA_RF_TYPE);
>> rt2800_register_read(rt2x00dev, MAC_CSR0, ®);
>> - rt2x00_set_chip(rt2x00dev, RT2870, value, reg);
>> + rt2x00_set_chip_rf(rt2x00dev, value, reg);
>>
>> /*
>> * The check for rt2860 is not a typo, some rt2870 hardware
>> * identifies itself as rt2860 in the CSR register.
>> */
>> - if (!rt2x00_check_rev(&rt2x00dev->chip, 0xfff00000, 0x28600000) &&
>> - !rt2x00_check_rev(&rt2x00dev->chip, 0xfff00000, 0x28700000) &&
>> - !rt2x00_check_rev(&rt2x00dev->chip, 0xfff00000, 0x28800000) &&
>> - !rt2x00_check_rev(&rt2x00dev->chip, 0xffff0000, 0x30700000)) {
>> + if (rt2x00_check_rev(&rt2x00dev->chip, 0xfff00000, 0x28600000) ||
>> + rt2x00_check_rev(&rt2x00dev->chip, 0xfff00000, 0x28700000) ||
>> + rt2x00_check_rev(&rt2x00dev->chip, 0xfff00000, 0x28800000)) {
>> + rt2x00_set_chip_rt(rt2x00dev, RT3070);
>
> Typo?
>
Doh. You're right. And I did even test this on a RT2870 device :-(
Thanks for noticing this.
I'll resend the patch with this fixed.
But first, I need to find a brown paper bag somewhere. ;-)
---
Gertjan.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
