rt2x00: Update copyright year to 2009
PATCH 3/3 rt2x00: Add LED_MODE_ASUS support
In reply to Ivo van DoornWhen the led mode is asus, the activity led mode must be registered otherwise the second LED will not be enabled.
Signed-off-by Ivo van Doorn <[email protected]>
---
John, this should fix Fedora Bug 437391:
"RT2500 from kernel-2.6.23.15-137.fc8 - no power LED"
drivers/net/wireless/rt2x00/rt2400pci.c | 4 +++- drivers/net/wireless/rt2x00/rt2500pci.c | 4 +++- drivers/net/wireless/rt2x00/rt2500usb.c | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-)
drivers/net/wireless/rt2x00/rt2400pci.c +3 -1
@@ -1397,7 +1397,9 @@ static int rt2400pci_init_eeprom(struct rt2x00_dev *rt2x00dev) value =rt2x00_get_field16 (eeprom,EEPROM_ANTENNA_LED_MODE );rt2400pci_init_led (rt2x00dev, &rt2x00dev->led_radio,LED_TYPE_RADIO ); -if (value ==LED_MODE_TXRX_ACTIVITY || value ==LED_MODE_DEFAULT ) +if (value ==LED_MODE_TXRX_ACTIVITY || + value ==LED_MODE_DEFAULT || + value ==LED_MODE_ASUS )rt2400pci_init_led (rt2x00dev, &rt2x00dev->led_qual,LED_TYPE_ACTIVITY );#endif /* CONFIG_RT2X00_LIB_LEDS */
drivers/net/wireless/rt2x00/rt2500pci.c +3 -1
@@ -1555,7 +1555,9 @@ static int rt2500pci_init_eeprom(struct rt2x00_dev *rt2x00dev) value =rt2x00_get_field16 (eeprom,EEPROM_ANTENNA_LED_MODE );rt2500pci_init_led (rt2x00dev, &rt2x00dev->led_radio,LED_TYPE_RADIO ); -if (value ==LED_MODE_TXRX_ACTIVITY || value ==LED_MODE_DEFAULT ) +if (value ==LED_MODE_TXRX_ACTIVITY || + value ==LED_MODE_DEFAULT || + value ==LED_MODE_ASUS )rt2500pci_init_led (rt2x00dev, &rt2x00dev->led_qual,LED_TYPE_ACTIVITY );#endif /* CONFIG_RT2X00_LIB_LEDS */
drivers/net/wireless/rt2x00/rt2500usb.c +3 -1
@@ -1605,7 +1605,9 @@ static int rt2500usb_init_eeprom(struct rt2x00_dev *rt2x00dev) value =rt2x00_get_field16 (eeprom,EEPROM_ANTENNA_LED_MODE );rt2500usb_init_led (rt2x00dev, &rt2x00dev->led_radio,LED_TYPE_RADIO ); -if (value ==LED_MODE_TXRX_ACTIVITY || value ==LED_MODE_DEFAULT ) +if (value ==LED_MODE_TXRX_ACTIVITY || + value ==LED_MODE_DEFAULT || + value ==LED_MODE_ASUS )rt2500usb_init_led (rt2x00dev, &rt2x00dev->led_qual,LED_TYPE_ACTIVITY );#endif /* CONFIG_RT2X00_LIB_LEDS */
Signature · 1 line
1.5.6.1
PATCH 1/3 rt2x00: Update copyright year to 2009
Signed-off-by Ivo van Doorn <[email protected]>
--- drivers/net/wireless/rt2x00/rt2400pci.c | 2 +- drivers/net/wireless/rt2x00/rt2400pci.h | 2 +- drivers/net/wireless/rt2x00/rt2500pci.c | 2 +- drivers/net/wireless/rt2x00/rt2500pci.h | 2 +- drivers/net/wireless/rt2x00/rt2500usb.c | 2 +- drivers/net/wireless/rt2x00/rt2500usb.h | 2 +- drivers/net/wireless/rt2x00/rt2x00.h | 2 +- drivers/net/wireless/rt2x00/rt2x00config.c | 2 +- drivers/net/wireless/rt2x00/rt2x00crypto.c | 2 +- drivers/net/wireless/rt2x00/rt2x00debug.c | 2 +- drivers/net/wireless/rt2x00/rt2x00debug.h | 2 +- drivers/net/wireless/rt2x00/rt2x00dev.c | 2 +- drivers/net/wireless/rt2x00/rt2x00dump.h | 2 +- drivers/net/wireless/rt2x00/rt2x00firmware.c | 2 +- drivers/net/wireless/rt2x00/rt2x00leds.c | 2 +- drivers/net/wireless/rt2x00/rt2x00leds.h | 2 +- drivers/net/wireless/rt2x00/rt2x00lib.h | 2 +- drivers/net/wireless/rt2x00/rt2x00link.c | 2 +- drivers/net/wireless/rt2x00/rt2x00mac.c | 2 +- drivers/net/wireless/rt2x00/rt2x00pci.c | 2 +- drivers/net/wireless/rt2x00/rt2x00pci.h | 2 +- drivers/net/wireless/rt2x00/rt2x00queue.c | 2 +- drivers/net/wireless/rt2x00/rt2x00queue.h | 2 +- drivers/net/wireless/rt2x00/rt2x00reg.h | 2 +- drivers/net/wireless/rt2x00/rt2x00rfkill.c | 2 +- drivers/net/wireless/rt2x00/rt2x00usb.c | 2 +- drivers/net/wireless/rt2x00/rt2x00usb.h | 2 +- drivers/net/wireless/rt2x00/rt61pci.c | 2 +- drivers/net/wireless/rt2x00/rt61pci.h | 2 +- drivers/net/wireless/rt2x00/rt73usb.c | 2 +- drivers/net/wireless/rt2x00/rt73usb.h | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-)
drivers/net/wireless/rt2x00/rt2400pci.c +1 -1
@@ -1,5 +1,5 @@/* -Copyright (C) 2004 - 2008 rt2x00 SourceForge Project +Copyright (C) 2004 - 2009 rt2x00 SourceForge Project <http://rt2x00.serialmonkey.com> This program is free software; you can redistribute it and/or modify
drivers/net/wireless/rt2x00/rt2400pci.h +1 -1
@@ -1,5 +1,5 @@/* -Copyright (C) 2004 - 2008 rt2x00 SourceForge Project +Copyright (C) 2004 - 2009 rt2x00 SourceForge Project <http://rt2x00.serialmonkey.com> This program is free software; you can redistribute it and/or modify
drivers/net/wireless/rt2x00/rt2500pci.c +1 -1
@@ -1,5 +1,5 @@/* -Copyright (C) 2004 - 2008 rt2x00 SourceForge Project +Copyright (C) 2004 - 2009 rt2x00 SourceForge Project <http://rt2x00.serialmonkey.com> This program is free software; you can redistribute it and/or modify
drivers/net/wireless/rt2x00/rt2500pci.h +1 -1
@@ -1,5 +1,5 @@/* -Copyright (C) 2004 - 2008 rt2x00 SourceForge Project +Copyright (C) 2004 - 2009 rt2x00 SourceForge Project <http://rt2x00.serialmonkey.com> This program is free software; you can redistribute it and/or modify
drivers/net/wireless/rt2x00/rt2500usb.c +1 -1
@@ -1,5 +1,5 @@/* -Copyright (C) 2004 - 2008 rt2x00 SourceForge Project +Copyright (C) 2004 - 2009 rt2x00 SourceForge Project <http://rt2x00.serialmonkey.com> This program is free software; you can redistribute it and/or modify
drivers/net/wireless/rt2x00/rt2500usb.h +1 -1
@@ -1,5 +1,5 @@/* -Copyright (C) 2004 - 2008 rt2x00 SourceForge Project +Copyright (C) 2004 - 2009 rt2x00 SourceForge Project <http://rt2x00.serialmonkey.com> This program is free software; you can redistribute it and/or modify
drivers/net/wireless/rt2x00/rt2x00.h +1 -1
@@ -1,5 +1,5 @@/* -Copyright (C) 2004 - 2008 rt2x00 SourceForge Project +Copyright (C) 2004 - 2009 rt2x00 SourceForge Project <http://rt2x00.serialmonkey.com> This program is free software; you can redistribute it and/or modify
drivers/net/wireless/rt2x00/rt2x00config.c +1 -1
@@ -1,5 +1,5 @@/* -Copyright (C) 2004 - 2008 rt2x00 SourceForge Project +Copyright (C) 2004 - 2009 rt2x00 SourceForge Project <http://rt2x00.serialmonkey.com> This program is free software; you can redistribute it and/or modify
drivers/net/wireless/rt2x00/rt2x00crypto.c +1 -1
@@ -1,5 +1,5 @@/* -Copyright (C) 2004 - 2008 rt2x00 SourceForge Project +Copyright (C) 2004 - 2009 rt2x00 SourceForge Project <http://rt2x00.serialmonkey.com> This program is free software; you can redistribute it and/or modify
drivers/net/wireless/rt2x00/rt2x00debug.c +1 -1
@@ -1,5 +1,5 @@/* -Copyright (C) 2004 - 2008 rt2x00 SourceForge Project +Copyright (C) 2004 - 2009 rt2x00 SourceForge Project <http://rt2x00.serialmonkey.com> This program is free software; you can redistribute it and/or modify
drivers/net/wireless/rt2x00/rt2x00debug.h +1 -1
@@ -1,5 +1,5 @@/* -Copyright (C) 2004 - 2008 rt2x00 SourceForge Project +Copyright (C) 2004 - 2009 rt2x00 SourceForge Project <http://rt2x00.serialmonkey.com> This program is free software; you can redistribute it and/or modify
drivers/net/wireless/rt2x00/rt2x00dev.c +1 -1
@@ -1,5 +1,5 @@/* -Copyright (C) 2004 - 2008 rt2x00 SourceForge Project +Copyright (C) 2004 - 2009 rt2x00 SourceForge Project <http://rt2x00.serialmonkey.com> This program is free software; you can redistribute it and/or modify
drivers/net/wireless/rt2x00/rt2x00dump.h +1 -1
@@ -1,5 +1,5 @@/* -Copyright (C) 2004 - 2008 rt2x00 SourceForge Project +Copyright (C) 2004 - 2009 rt2x00 SourceForge Project <http://rt2x00.serialmonkey.com> This program is free software; you can redistribute it and/or modify
drivers/net/wireless/rt2x00/rt2x00firmware.c +1 -1
@@ -1,5 +1,5 @@/* -Copyright (C) 2004 - 2008 rt2x00 SourceForge Project +Copyright (C) 2004 - 2009 rt2x00 SourceForge Project <http://rt2x00.serialmonkey.com> This program is free software; you can redistribute it and/or modify
drivers/net/wireless/rt2x00/rt2x00leds.c +1 -1
@@ -1,5 +1,5 @@/* -Copyright (C) 2004 - 2008 rt2x00 SourceForge Project +Copyright (C) 2004 - 2009 rt2x00 SourceForge Project <http://rt2x00.serialmonkey.com> This program is free software; you can redistribute it and/or modify
drivers/net/wireless/rt2x00/rt2x00leds.h +1 -1
@@ -1,5 +1,5 @@/* -Copyright (C) 2004 - 2008 rt2x00 SourceForge Project +Copyright (C) 2004 - 2009 rt2x00 SourceForge Project <http://rt2x00.serialmonkey.com> This program is free software; you can redistribute it and/or modify
drivers/net/wireless/rt2x00/rt2x00lib.h +1 -1
@@ -1,5 +1,5 @@/* -Copyright (C) 2004 - 2008 rt2x00 SourceForge Project +Copyright (C) 2004 - 2009 rt2x00 SourceForge Project <http://rt2x00.serialmonkey.com> This program is free software; you can redistribute it and/or modify
drivers/net/wireless/rt2x00/rt2x00link.c +1 -1
@@ -1,5 +1,5 @@/* -Copyright (C) 2004 - 2008 rt2x00 SourceForge Project +Copyright (C) 2004 - 2009 rt2x00 SourceForge Project <http://rt2x00.serialmonkey.com> This program is free software; you can redistribute it and/or modify
drivers/net/wireless/rt2x00/rt2x00mac.c +1 -1
@@ -1,5 +1,5 @@/* -Copyright (C) 2004 - 2008 rt2x00 SourceForge Project +Copyright (C) 2004 - 2009 rt2x00 SourceForge Project <http://rt2x00.serialmonkey.com> This program is free software; you can redistribute it and/or modify
drivers/net/wireless/rt2x00/rt2x00pci.c +1 -1
@@ -1,5 +1,5 @@/* -Copyright (C) 2004 - 2008 rt2x00 SourceForge Project +Copyright (C) 2004 - 2009 rt2x00 SourceForge Project <http://rt2x00.serialmonkey.com> This program is free software; you can redistribute it and/or modify
drivers/net/wireless/rt2x00/rt2x00pci.h +1 -1
@@ -1,5 +1,5 @@/* -Copyright (C) 2004 - 2008 rt2x00 SourceForge Project +Copyright (C) 2004 - 2009 rt2x00 SourceForge Project <http://rt2x00.serialmonkey.com> This program is free software; you can redistribute it and/or modify
drivers/net/wireless/rt2x00/rt2x00queue.c +1 -1
@@ -1,5 +1,5 @@/* -Copyright (C) 2004 - 2008 rt2x00 SourceForge Project +Copyright (C) 2004 - 2009 rt2x00 SourceForge Project <http://rt2x00.serialmonkey.com> This program is free software; you can redistribute it and/or modify
drivers/net/wireless/rt2x00/rt2x00queue.h +1 -1
@@ -1,5 +1,5 @@/* -Copyright (C) 2004 - 2008 rt2x00 SourceForge Project +Copyright (C) 2004 - 2009 rt2x00 SourceForge Project <http://rt2x00.serialmonkey.com> This program is free software; you can redistribute it and/or modify
drivers/net/wireless/rt2x00/rt2x00reg.h +1 -1
@@ -1,5 +1,5 @@/* -Copyright (C) 2004 - 2008 rt2x00 SourceForge Project +Copyright (C) 2004 - 2009 rt2x00 SourceForge Project <http://rt2x00.serialmonkey.com> This program is free software; you can redistribute it and/or modify
drivers/net/wireless/rt2x00/rt2x00rfkill.c +1 -1
@@ -1,5 +1,5 @@/* -Copyright (C) 2004 - 2008 rt2x00 SourceForge Project +Copyright (C) 2004 - 2009 rt2x00 SourceForge Project <http://rt2x00.serialmonkey.com> This program is free software; you can redistribute it and/or modify
drivers/net/wireless/rt2x00/rt2x00usb.c +1 -1
@@ -1,5 +1,5 @@/* -Copyright (C) 2004 - 2008 rt2x00 SourceForge Project +Copyright (C) 2004 - 2009 rt2x00 SourceForge Project <http://rt2x00.serialmonkey.com> This program is free software; you can redistribute it and/or modify
drivers/net/wireless/rt2x00/rt2x00usb.h +1 -1
@@ -1,5 +1,5 @@/* -Copyright (C) 2004 - 2008 rt2x00 SourceForge Project +Copyright (C) 2004 - 2009 rt2x00 SourceForge Project <http://rt2x00.serialmonkey.com> This program is free software; you can redistribute it and/or modify
drivers/net/wireless/rt2x00/rt61pci.c +1 -1
@@ -1,5 +1,5 @@/* -Copyright (C) 2004 - 2008 rt2x00 SourceForge Project +Copyright (C) 2004 - 2009 rt2x00 SourceForge Project <http://rt2x00.serialmonkey.com> This program is free software; you can redistribute it and/or modify
drivers/net/wireless/rt2x00/rt61pci.h +1 -1
@@ -1,5 +1,5 @@/* -Copyright (C) 2004 - 2008 rt2x00 SourceForge Project +Copyright (C) 2004 - 2009 rt2x00 SourceForge Project <http://rt2x00.serialmonkey.com> This program is free software; you can redistribute it and/or modify
drivers/net/wireless/rt2x00/rt73usb.c +1 -1
@@ -1,5 +1,5 @@/* -Copyright (C) 2004 - 2008 rt2x00 SourceForge Project +Copyright (C) 2004 - 2009 rt2x00 SourceForge Project <http://rt2x00.serialmonkey.com> This program is free software; you can redistribute it and/or modify
drivers/net/wireless/rt2x00/rt73usb.h +1 -1
@@ -1,5 +1,5 @@/* -Copyright (C) 2004 - 2008 rt2x00 SourceForge Project +Copyright (C) 2004 - 2009 rt2x00 SourceForge Project <http://rt2x00.serialmonkey.com> This program is free software; you can redistribute it and/or modify
Signature · 1 line
1.5.6.1
PATCH 2/3 rt2x00: conf_tx() only need register access for WMM queues
conf_tx() in rt61pci and rt73usb only have to check once if the queue_idx indicates a non-WMM queue and break of the function immediately if that is the case.
Only the WMM queues need to have the TX configuration written to the registers.
Signed-off-by Ivo van Doorn <[email protected]>
--- drivers/net/wireless/rt2x00/rt61pci.c | 30 +++++++++++++++--------------- drivers/net/wireless/rt2x00/rt73usb.c | 30 +++++++++++++++--------------- 2 files changed, 30 insertions(+), 30 deletions(-)
drivers/net/wireless/rt2x00/rt61pci.c +15 -15
@@ -2659,6 +2659,7 @@ static int rt61pci_conf_tx(struct ieee80211_hw *hw, u16 queue_idx,struct rt2x00_field32 field;int retval;u32 reg; +u32 offset;/* * First pass the configuration through rt2x00lib, that will
@@ -2670,24 +2671,23 @@ static int rt61pci_conf_tx(struct ieee80211_hw *hw, u16 queue_idx,if (retval)return retval; +/* +* We only need to perform additional register initialization +* for WMM queues/ +*/ +if (queue_idx >=4 ) +return 0 ; + queue =rt2x00queue_get_queue (rt2x00dev, queue_idx);/* Update WMM TXOP register */ -if (queue_idx <2 ) { - field.bit_offset = queue_idx *16 ; - field.bit_mask =0xffff << field.bit_offset; - -rt2x00pci_register_read (rt2x00dev,AC_TXOP_CSR0 , ®); -rt2x00_set_field32 (®, field, queue->txop); -rt2x00pci_register_write (rt2x00dev,AC_TXOP_CSR0 , reg); - }else if (queue_idx <4 ) { - field.bit_offset = (queue_idx -2 ) *16 ; - field.bit_mask =0xffff << field.bit_offset; - -rt2x00pci_register_read (rt2x00dev,AC_TXOP_CSR1 , ®); -rt2x00_set_field32 (®, field, queue->txop); -rt2x00pci_register_write (rt2x00dev,AC_TXOP_CSR1 , reg); - } + offset =AC_TXOP_CSR0 + (sizeof (u32) * (!!(queue_idx &2 ))); + field.bit_offset = (queue_idx &1 ) *16 ; + field.bit_mask =0xffff << field.bit_offset; + +rt2x00pci_register_read (rt2x00dev, offset, ®); +rt2x00_set_field32 (®, field, queue->txop); +rt2x00pci_register_write (rt2x00dev, offset, reg);/* Update WMM registers */ field.bit_offset = queue_idx *4 ;
drivers/net/wireless/rt2x00/rt73usb.c +15 -15
@@ -2182,6 +2182,7 @@ static int rt73usb_conf_tx(struct ieee80211_hw *hw, u16 queue_idx,struct rt2x00_field32 field;int retval;u32 reg; +u32 offset;/* * First pass the configuration through rt2x00lib, that will
@@ -2193,24 +2194,23 @@ static int rt73usb_conf_tx(struct ieee80211_hw *hw, u16 queue_idx,if (retval)return retval; +/* +* We only need to perform additional register initialization +* for WMM queues/ +*/ +if (queue_idx >=4 ) +return 0 ; + queue =rt2x00queue_get_queue (rt2x00dev, queue_idx);/* Update WMM TXOP register */ -if (queue_idx <2 ) { - field.bit_offset = queue_idx *16 ; - field.bit_mask =0xffff << field.bit_offset; - -rt2x00usb_register_read (rt2x00dev,AC_TXOP_CSR0 , ®); -rt2x00_set_field32 (®, field, queue->txop); -rt2x00usb_register_write (rt2x00dev,AC_TXOP_CSR0 , reg); - }else if (queue_idx <4 ) { - field.bit_offset = (queue_idx -2 ) *16 ; - field.bit_mask =0xffff << field.bit_offset; - -rt2x00usb_register_read (rt2x00dev,AC_TXOP_CSR1 , ®); -rt2x00_set_field32 (®, field, queue->txop); -rt2x00usb_register_write (rt2x00dev,AC_TXOP_CSR1 , reg); - } + offset =AC_TXOP_CSR0 + (sizeof (u32) * (!!(queue_idx &2 ))); + field.bit_offset = (queue_idx &1 ) *16 ; + field.bit_mask =0xffff << field.bit_offset; + +rt2x00usb_register_read (rt2x00dev, offset, ®); +rt2x00_set_field32 (®, field, queue->txop); +rt2x00usb_register_write (rt2x00dev, offset, reg);/* Update WMM registers */ field.bit_offset = queue_idx *4 ;
Signature · 1 line
1.5.6.1