rt2x00: Add new rt2800usb USB ID's for Sweex
PATCH 1/2 rt2x00: Add new rt2800usb USB ID's for Sweex
The USB ID with unknown manufacturer is apparently sweex, copy it to the correct location of the list and add 2 additional USB ID's also belonging to Sweex.
Signed-off-by Ivo van Doorn <[email protected]>
--- drivers/net/wireless/rt2x00/rt2800usb.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
drivers/net/wireless/rt2x00/rt2800usb.c +4 -2
@@ -2881,8 +2881,6 @@ static const struct rt2x00_ops rt2800usb_ops = {* rt2800usb module information. */ static struct usb_device_id rt2800usb_device_table[] = { -/* ??? */ - {USB_DEVICE (0x177f ,0x0302 ),USB_DEVICE_DATA (&rt2800usb_ops) },/* Abocom */ {USB_DEVICE (0x07b8 ,0x2870 ),USB_DEVICE_DATA (&rt2800usb_ops) }, {USB_DEVICE (0x07b8 ,0x2770 ),USB_DEVICE_DATA (&rt2800usb_ops) },
@@ -3027,6 +3025,10 @@ static struct usb_device_id rt2800usb_device_table[] = { { USB_DEVICE(0x083a, 0xc522), USB_DEVICE_DATA(&rt2800usb_ops) },/* Sparklan */ { USB_DEVICE(0x15a9, 0x0006), USB_DEVICE_DATA(&rt2800usb_ops) }, +/* Sweex */ + { USB_DEVICE(0x177f, 0x0153), USB_DEVICE_DATA(&rt2800usb_ops) }, + { USB_DEVICE(0x177f, 0x0302), USB_DEVICE_DATA(&rt2800usb_ops) }, + { USB_DEVICE(0x177f, 0x0313), USB_DEVICE_DATA(&rt2800usb_ops) },/* U-Media*/ { USB_DEVICE(0x157e, 0x300e), USB_DEVICE_DATA(&rt2800usb_ops) }, /* ZCOM */
Signature · 1 line
1.6.3
PATCH 2/2 rt2x00: Remove usage of IEEE80211_CONF_CHANGE_BEACON_INTERVAL
IEEE80211_CONF_CHANGE_BEACON_INTERVAL was deprecated a month ago, it is about time to remove all usage from the rt2x00 drivers and use the correct beacon interval configuration through the bss_info structure.
Signed-off-by Ivo van Doorn <[email protected]>
--- drivers/net/wireless/rt2x00/rt2400pci.c | 30 +++++++-------------------- drivers/net/wireless/rt2x00/rt2500pci.c | 30 +++++++-------------------- drivers/net/wireless/rt2x00/rt2500usb.c | 17 +++------------ drivers/net/wireless/rt2x00/rt2800usb.c | 18 ++++------------ drivers/net/wireless/rt2x00/rt2x00.h | 2 + drivers/net/wireless/rt2x00/rt2x00config.c | 1 + drivers/net/wireless/rt2x00/rt61pci.c | 28 ++++++------------------- drivers/net/wireless/rt2x00/rt73usb.c | 28 ++++++------------------- 8 files changed, 42 insertions(+), 112 deletions(-)
drivers/net/wireless/rt2x00/rt2400pci.c +8 -22
@@ -335,10 +335,11 @@ static void rt2400pci_config_erp(struct rt2x00_dev *rt2x00dev, preamble_mask = erp->short_preamble <<3 ;rt2x00pci_register_read (rt2x00dev,TXCSR1 , ®); -rt2x00_set_field32 (®,TXCSR1_ACK_TIMEOUT , - erp->ack_timeout); +rt2x00_set_field32 (®,TXCSR1_ACK_TIMEOUT , erp->ack_timeout);rt2x00_set_field32 (®,TXCSR1_ACK_CONSUME_TIME , erp->ack_consume_time); +rt2x00_set_field32 (®,TXCSR1_TSF_OFFSET ,IEEE80211_HEADER ); +rt2x00_set_field32 (®,TXCSR1_AUTORESPONDER ,1 );rt2x00pci_register_write (rt2x00dev,TXCSR1 , reg);rt2x00pci_register_read (rt2x00dev,ARCSR2 , ®);
@@ -371,6 +372,11 @@ static void rt2400pci_config_erp(struct rt2x00_dev *rt2x00dev,rt2x00_set_field32 (®,CSR11_SLOT_TIME , erp->slot_time);rt2x00pci_register_write (rt2x00dev,CSR11 , reg); +rt2x00pci_register_read (rt2x00dev,CSR12 , ®); +rt2x00_set_field32 (®,CSR12_BEACON_INTERVAL , erp->beacon_int *16 ); +rt2x00_set_field32 (®,CSR12_CFP_MAX_DURATION , erp->beacon_int *16 ); +rt2x00pci_register_write (rt2x00dev,CSR12 , reg); +rt2x00pci_register_read (rt2x00dev,CSR18 , ®);rt2x00_set_field32 (®,CSR18_SIFS , erp->sifs);rt2x00_set_field32 (®,CSR18_PIFS , erp->pifs);
@@ -503,24 +509,6 @@ static void rt2400pci_config_retry_limit(struct rt2x00_dev *rt2x00dev,rt2x00pci_register_write (rt2x00dev,CSR11 , reg); } -static void rt2400pci_config_duration (struct rt2x00_dev *rt2x00dev, -struct rt2x00lib_conf *libconf) -{ -u32 reg; - -rt2x00pci_register_read (rt2x00dev,TXCSR1 , ®); -rt2x00_set_field32 (®,TXCSR1_TSF_OFFSET ,IEEE80211_HEADER ); -rt2x00_set_field32 (®,TXCSR1_AUTORESPONDER ,1 ); -rt2x00pci_register_write (rt2x00dev,TXCSR1 , reg); - -rt2x00pci_register_read (rt2x00dev,CSR12 , ®); -rt2x00_set_field32 (®,CSR12_BEACON_INTERVAL , - libconf->conf->beacon_int *16 ); -rt2x00_set_field32 (®,CSR12_CFP_MAX_DURATION , - libconf->conf->beacon_int *16 ); -rt2x00pci_register_write (rt2x00dev,CSR12 , reg); -} -static void rt2400pci_config_ps (struct rt2x00_dev *rt2x00dev,struct rt2x00lib_conf *libconf) {
@@ -558,8 +546,6 @@ static void rt2400pci_config(struct rt2x00_dev *rt2x00dev, libconf->conf->power_level);if (flags &IEEE80211_CONF_CHANGE_RETRY_LIMITS )rt2400pci_config_retry_limit (rt2x00dev, libconf); -if (flags &IEEE80211_CONF_CHANGE_BEACON_INTERVAL ) -rt2400pci_config_duration (rt2x00dev, libconf);if (flags &IEEE80211_CONF_CHANGE_PS )rt2400pci_config_ps (rt2x00dev, libconf); }
drivers/net/wireless/rt2x00/rt2500pci.c +8 -22
@@ -341,10 +341,11 @@ static void rt2500pci_config_erp(struct rt2x00_dev *rt2x00dev, preamble_mask = erp->short_preamble <<3 ;rt2x00pci_register_read (rt2x00dev,TXCSR1 , ®); -rt2x00_set_field32 (®,TXCSR1_ACK_TIMEOUT , - erp->ack_timeout); +rt2x00_set_field32 (®,TXCSR1_ACK_TIMEOUT , erp->ack_timeout);rt2x00_set_field32 (®,TXCSR1_ACK_CONSUME_TIME , erp->ack_consume_time); +rt2x00_set_field32 (®,TXCSR1_TSF_OFFSET ,IEEE80211_HEADER ); +rt2x00_set_field32 (®,TXCSR1_AUTORESPONDER ,1 );rt2x00pci_register_write (rt2x00dev,TXCSR1 , reg);rt2x00pci_register_read (rt2x00dev,ARCSR2 , ®);
@@ -377,6 +378,11 @@ static void rt2500pci_config_erp(struct rt2x00_dev *rt2x00dev,rt2x00_set_field32 (®,CSR11_SLOT_TIME , erp->slot_time);rt2x00pci_register_write (rt2x00dev,CSR11 , reg); +rt2x00pci_register_read (rt2x00dev,CSR12 , ®); +rt2x00_set_field32 (®,CSR12_BEACON_INTERVAL , erp->beacon_int *16 ); +rt2x00_set_field32 (®,CSR12_CFP_MAX_DURATION , erp->beacon_int *16 ); +rt2x00pci_register_write (rt2x00dev,CSR12 , reg); +rt2x00pci_register_read (rt2x00dev,CSR18 , ®);rt2x00_set_field32 (®,CSR18_SIFS , erp->sifs);rt2x00_set_field32 (®,CSR18_PIFS , erp->pifs);
@@ -552,24 +558,6 @@ static void rt2500pci_config_retry_limit(struct rt2x00_dev *rt2x00dev,rt2x00pci_register_write (rt2x00dev,CSR11 , reg); } -static void rt2500pci_config_duration (struct rt2x00_dev *rt2x00dev, -struct rt2x00lib_conf *libconf) -{ -u32 reg; - -rt2x00pci_register_read (rt2x00dev,TXCSR1 , ®); -rt2x00_set_field32 (®,TXCSR1_TSF_OFFSET ,IEEE80211_HEADER ); -rt2x00_set_field32 (®,TXCSR1_AUTORESPONDER ,1 ); -rt2x00pci_register_write (rt2x00dev,TXCSR1 , reg); - -rt2x00pci_register_read (rt2x00dev,CSR12 , ®); -rt2x00_set_field32 (®,CSR12_BEACON_INTERVAL , - libconf->conf->beacon_int *16 ); -rt2x00_set_field32 (®,CSR12_CFP_MAX_DURATION , - libconf->conf->beacon_int *16 ); -rt2x00pci_register_write (rt2x00dev,CSR12 , reg); -} -static void rt2500pci_config_ps (struct rt2x00_dev *rt2x00dev,struct rt2x00lib_conf *libconf) {
@@ -609,8 +597,6 @@ static void rt2500pci_config(struct rt2x00_dev *rt2x00dev, libconf->conf->power_level);if (flags &IEEE80211_CONF_CHANGE_RETRY_LIMITS )rt2500pci_config_retry_limit (rt2x00dev, libconf); -if (flags &IEEE80211_CONF_CHANGE_BEACON_INTERVAL ) -rt2500pci_config_duration (rt2x00dev, libconf);if (flags &IEEE80211_CONF_CHANGE_PS )rt2500pci_config_ps (rt2x00dev, libconf); }
drivers/net/wireless/rt2x00/rt2500usb.c +4 -13
@@ -503,6 +503,10 @@ static void rt2500usb_config_erp(struct rt2x00_dev *rt2x00dev,rt2500usb_register_write (rt2x00dev,TXRX_CSR11 , erp->basic_rates); +rt2500usb_register_read (rt2x00dev,TXRX_CSR18 , ®); +rt2x00_set_field16 (®,TXRX_CSR18_INTERVAL , erp->beacon_int *4 ); +rt2500usb_register_write (rt2x00dev,TXRX_CSR18 , reg); +rt2500usb_register_write (rt2x00dev,MAC_CSR10 , erp->slot_time);rt2500usb_register_write (rt2x00dev,MAC_CSR11 , erp->sifs);rt2500usb_register_write (rt2x00dev,MAC_CSR12 , erp->eifs);
@@ -632,17 +636,6 @@ static void rt2500usb_config_txpower(struct rt2x00_dev *rt2x00dev,rt2500usb_rf_write (rt2x00dev,3 , rf3); } -static void rt2500usb_config_duration (struct rt2x00_dev *rt2x00dev, -struct rt2x00lib_conf *libconf) -{ -u16 reg; - -rt2500usb_register_read (rt2x00dev,TXRX_CSR18 , ®); -rt2x00_set_field16 (®,TXRX_CSR18_INTERVAL , - libconf->conf->beacon_int *4 ); -rt2500usb_register_write (rt2x00dev,TXRX_CSR18 , reg); -} -static void rt2500usb_config_ps (struct rt2x00_dev *rt2x00dev,struct rt2x00lib_conf *libconf) {
@@ -680,8 +673,6 @@ static void rt2500usb_config(struct rt2x00_dev *rt2x00dev, !(flags & IEEE80211_CONF_CHANGE_CHANNEL))rt2500usb_config_txpower (rt2x00dev, libconf->conf->power_level); -if (flags &IEEE80211_CONF_CHANGE_BEACON_INTERVAL ) -rt2500usb_config_duration (rt2x00dev, libconf);if (flags &IEEE80211_CONF_CHANGE_PS )rt2500usb_config_ps (rt2x00dev, libconf); }
drivers/net/wireless/rt2x00/rt2800usb.c +5 -13
@@ -616,6 +616,11 @@ static void rt2800usb_config_erp(struct rt2x00_dev *rt2x00dev,rt2x00_set_field32 (®,XIFS_TIME_CFG_EIFS , erp->eifs);rt2x00_set_field32 (®,XIFS_TIME_CFG_BB_RXEND_ENABLE ,1 );rt2x00usb_register_write (rt2x00dev,XIFS_TIME_CFG , reg); + +rt2x00usb_register_read (rt2x00dev,BCN_TIME_CFG , ®); +rt2x00_set_field32 (®,BCN_TIME_CFG_BEACON_INTERVAL , + erp->beacon_int *16 ); +rt2x00usb_register_write (rt2x00dev,BCN_TIME_CFG , reg); } static void rt2800usb_config_ant(struct rt2x00_dev *rt2x00dev,
@@ -955,17 +960,6 @@ static void rt2800usb_config_retry_limit(struct rt2x00_dev *rt2x00dev,rt2x00usb_register_write (rt2x00dev,TX_RTY_CFG , reg); } -static void rt2800usb_config_duration (struct rt2x00_dev *rt2x00dev, -struct rt2x00lib_conf *libconf) -{ -u32 reg; - -rt2x00usb_register_read (rt2x00dev,BCN_TIME_CFG , ®); -rt2x00_set_field32 (®,BCN_TIME_CFG_BEACON_INTERVAL , - libconf->conf->beacon_int *16 ); -rt2x00usb_register_write (rt2x00dev,BCN_TIME_CFG , reg); -} -static void rt2800usb_config_ps (struct rt2x00_dev *rt2x00dev,struct rt2x00lib_conf *libconf) {
@@ -1010,8 +1004,6 @@ static void rt2800usb_config(struct rt2x00_dev *rt2x00dev,rt2800usb_config_txpower (rt2x00dev, libconf->conf->power_level);if (flags &IEEE80211_CONF_CHANGE_RETRY_LIMITS )rt2800usb_config_retry_limit (rt2x00dev, libconf); -if (flags &IEEE80211_CONF_CHANGE_BEACON_INTERVAL ) -rt2800usb_config_duration (rt2x00dev, libconf);if (flags &IEEE80211_CONF_CHANGE_PS )rt2800usb_config_ps (rt2x00dev, libconf); }
drivers/net/wireless/rt2x00/rt2x00.h +2 -0
@@ -417,6 +417,8 @@ struct rt2x00lib_erp {short pifs;short difs;short eifs; + +u16 beacon_int; };/*
drivers/net/wireless/rt2x00/rt2x00config.c +1 -0
@@ -106,6 +106,7 @@ void rt2x00lib_config_erp(struct rt2x00_dev *rt2x00dev, } erp.basic_rates = bss_conf->basic_rates; + erp.beacon_int = bss_conf->beacon_int; rt2x00dev->ops->lib->config_erp (rt2x00dev, &erp); }
drivers/net/wireless/rt2x00/rt61pci.c +7 -21
@@ -603,15 +603,22 @@ static void rt61pci_config_erp(struct rt2x00_dev *rt2x00dev,rt2x00pci_register_read (rt2x00dev,TXRX_CSR0 , ®);rt2x00_set_field32 (®,TXRX_CSR0_RX_ACK_TIMEOUT , erp->ack_timeout); +rt2x00_set_field32 (®,TXRX_CSR0_TSF_OFFSET ,IEEE80211_HEADER );rt2x00pci_register_write (rt2x00dev,TXRX_CSR0 , reg);rt2x00pci_register_read (rt2x00dev,TXRX_CSR4 , ®); +rt2x00_set_field32 (®,TXRX_CSR4_AUTORESPOND_ENABLE ,1 );rt2x00_set_field32 (®,TXRX_CSR4_AUTORESPOND_PREAMBLE , !!erp->short_preamble);rt2x00pci_register_write (rt2x00dev,TXRX_CSR4 , reg);rt2x00pci_register_write (rt2x00dev,TXRX_CSR5 , erp->basic_rates); +rt2x00pci_register_read (rt2x00dev,TXRX_CSR9 , ®); +rt2x00_set_field32 (®,TXRX_CSR9_BEACON_INTERVAL , + erp->beacon_int *16 ); +rt2x00pci_register_write (rt2x00dev,TXRX_CSR9 , reg); +rt2x00pci_register_read (rt2x00dev,MAC_CSR9 , ®);rt2x00_set_field32 (®,MAC_CSR9_SLOT_TIME , erp->slot_time);rt2x00pci_register_write (rt2x00dev,MAC_CSR9 , reg);
@@ -938,25 +945,6 @@ static void rt61pci_config_retry_limit(struct rt2x00_dev *rt2x00dev,rt2x00pci_register_write (rt2x00dev,TXRX_CSR4 , reg); } -static void rt61pci_config_duration (struct rt2x00_dev *rt2x00dev, -struct rt2x00lib_conf *libconf) -{ -u32 reg; - -rt2x00pci_register_read (rt2x00dev,TXRX_CSR0 , ®); -rt2x00_set_field32 (®,TXRX_CSR0_TSF_OFFSET ,IEEE80211_HEADER ); -rt2x00pci_register_write (rt2x00dev,TXRX_CSR0 , reg); - -rt2x00pci_register_read (rt2x00dev,TXRX_CSR4 , ®); -rt2x00_set_field32 (®,TXRX_CSR4_AUTORESPOND_ENABLE ,1 ); -rt2x00pci_register_write (rt2x00dev,TXRX_CSR4 , reg); - -rt2x00pci_register_read (rt2x00dev,TXRX_CSR9 , ®); -rt2x00_set_field32 (®,TXRX_CSR9_BEACON_INTERVAL , - libconf->conf->beacon_int *16 ); -rt2x00pci_register_write (rt2x00dev,TXRX_CSR9 , reg); -} -static void rt61pci_config_ps (struct rt2x00_dev *rt2x00dev,struct rt2x00lib_conf *libconf) {
@@ -1016,8 +1004,6 @@ static void rt61pci_config(struct rt2x00_dev *rt2x00dev,rt61pci_config_txpower (rt2x00dev, libconf->conf->power_level);if (flags &IEEE80211_CONF_CHANGE_RETRY_LIMITS )rt61pci_config_retry_limit (rt2x00dev, libconf); -if (flags &IEEE80211_CONF_CHANGE_BEACON_INTERVAL ) -rt61pci_config_duration (rt2x00dev, libconf);if (flags &IEEE80211_CONF_CHANGE_PS )rt61pci_config_ps (rt2x00dev, libconf); }
drivers/net/wireless/rt2x00/rt73usb.c +7 -21
@@ -566,15 +566,22 @@ static void rt73usb_config_erp(struct rt2x00_dev *rt2x00dev,rt2x00usb_register_read (rt2x00dev,TXRX_CSR0 , ®);rt2x00_set_field32 (®,TXRX_CSR0_RX_ACK_TIMEOUT , erp->ack_timeout); +rt2x00_set_field32 (®,TXRX_CSR0_TSF_OFFSET ,IEEE80211_HEADER );rt2x00usb_register_write (rt2x00dev,TXRX_CSR0 , reg);rt2x00usb_register_read (rt2x00dev,TXRX_CSR4 , ®); +rt2x00_set_field32 (®,TXRX_CSR4_AUTORESPOND_ENABLE ,1 );rt2x00_set_field32 (®,TXRX_CSR4_AUTORESPOND_PREAMBLE , !!erp->short_preamble);rt2x00usb_register_write (rt2x00dev,TXRX_CSR4 , reg);rt2x00usb_register_write (rt2x00dev,TXRX_CSR5 , erp->basic_rates); +rt2x00usb_register_read (rt2x00dev,TXRX_CSR9 , ®); +rt2x00_set_field32 (®,TXRX_CSR9_BEACON_INTERVAL , + erp->beacon_int *16 ); +rt2x00usb_register_write (rt2x00dev,TXRX_CSR9 , reg); +rt2x00usb_register_read (rt2x00dev,MAC_CSR9 , ®);rt2x00_set_field32 (®,MAC_CSR9_SLOT_TIME , erp->slot_time);rt2x00usb_register_write (rt2x00dev,MAC_CSR9 , reg);
@@ -834,25 +841,6 @@ static void rt73usb_config_retry_limit(struct rt2x00_dev *rt2x00dev,rt2x00usb_register_write (rt2x00dev,TXRX_CSR4 , reg); } -static void rt73usb_config_duration (struct rt2x00_dev *rt2x00dev, -struct rt2x00lib_conf *libconf) -{ -u32 reg; - -rt2x00usb_register_read (rt2x00dev,TXRX_CSR0 , ®); -rt2x00_set_field32 (®,TXRX_CSR0_TSF_OFFSET ,IEEE80211_HEADER ); -rt2x00usb_register_write (rt2x00dev,TXRX_CSR0 , reg); - -rt2x00usb_register_read (rt2x00dev,TXRX_CSR4 , ®); -rt2x00_set_field32 (®,TXRX_CSR4_AUTORESPOND_ENABLE ,1 ); -rt2x00usb_register_write (rt2x00dev,TXRX_CSR4 , reg); - -rt2x00usb_register_read (rt2x00dev,TXRX_CSR9 , ®); -rt2x00_set_field32 (®,TXRX_CSR9_BEACON_INTERVAL , - libconf->conf->beacon_int *16 ); -rt2x00usb_register_write (rt2x00dev,TXRX_CSR9 , reg); -} -static void rt73usb_config_ps (struct rt2x00_dev *rt2x00dev,struct rt2x00lib_conf *libconf) {
@@ -906,8 +894,6 @@ static void rt73usb_config(struct rt2x00_dev *rt2x00dev,rt73usb_config_txpower (rt2x00dev, libconf->conf->power_level);if (flags &IEEE80211_CONF_CHANGE_RETRY_LIMITS )rt73usb_config_retry_limit (rt2x00dev, libconf); -if (flags &IEEE80211_CONF_CHANGE_BEACON_INTERVAL ) -rt73usb_config_duration (rt2x00dev, libconf);if (flags &IEEE80211_CONF_CHANGE_PS )rt73usb_config_ps (rt2x00dev, libconf); }
Signature · 1 line
1.6.3