aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/rt2x00/rt2400pci.c2
-rw-r--r--drivers/net/wireless/rt2x00/rt2500pci.c2
-rw-r--r--drivers/net/wireless/rt2x00/rt2500usb.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c
index 0e345659f421..bfab5a165b76 100644
--- a/drivers/net/wireless/rt2x00/rt2400pci.c
+++ b/drivers/net/wireless/rt2x00/rt2400pci.c
@@ -277,7 +277,7 @@ static void rt2400pci_config_type(struct rt2x00_dev *rt2x00dev, const int type,
277 */ 277 */
278 rt2x00pci_register_read(rt2x00dev, BCNCSR1, &reg); 278 rt2x00pci_register_read(rt2x00dev, BCNCSR1, &reg);
279 rt2x00_set_field32(&reg, BCNCSR1_PRELOAD, 279 rt2x00_set_field32(&reg, BCNCSR1_PRELOAD,
280 PREAMBLE + get_duration(IEEE80211_HEADER, 2)); 280 PREAMBLE + get_duration(IEEE80211_HEADER, 20));
281 rt2x00pci_register_write(rt2x00dev, BCNCSR1, reg); 281 rt2x00pci_register_write(rt2x00dev, BCNCSR1, reg);
282 282
283 /* 283 /*
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index fa8669f5c965..c8c6a848be97 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -277,7 +277,7 @@ static void rt2500pci_config_type(struct rt2x00_dev *rt2x00dev, const int type,
277 */ 277 */
278 rt2x00pci_register_read(rt2x00dev, BCNCSR1, &reg); 278 rt2x00pci_register_read(rt2x00dev, BCNCSR1, &reg);
279 rt2x00_set_field32(&reg, BCNCSR1_PRELOAD, 279 rt2x00_set_field32(&reg, BCNCSR1_PRELOAD,
280 PREAMBLE + get_duration(IEEE80211_HEADER, 2)); 280 PREAMBLE + get_duration(IEEE80211_HEADER, 20));
281 rt2x00_set_field32(&reg, BCNCSR1_BEACON_CWMIN, 281 rt2x00_set_field32(&reg, BCNCSR1_BEACON_CWMIN,
282 rt2x00lib_get_ring(rt2x00dev, 282 rt2x00lib_get_ring(rt2x00dev,
283 IEEE80211_TX_QUEUE_BEACON) 283 IEEE80211_TX_QUEUE_BEACON)
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index 6d5444b58e6c..c70c677b3f73 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -280,7 +280,7 @@ static void rt2500usb_config_type(struct rt2x00_dev *rt2x00dev, const int type,
280 */ 280 */
281 rt2500usb_register_read(rt2x00dev, TXRX_CSR20, &reg); 281 rt2500usb_register_read(rt2x00dev, TXRX_CSR20, &reg);
282 rt2x00_set_field16(&reg, TXRX_CSR20_OFFSET, 282 rt2x00_set_field16(&reg, TXRX_CSR20_OFFSET,
283 (PREAMBLE + get_duration(IEEE80211_HEADER, 2)) >> 6); 283 (PREAMBLE + get_duration(IEEE80211_HEADER, 20)) >> 6);
284 if (type == IEEE80211_IF_TYPE_STA) 284 if (type == IEEE80211_IF_TYPE_STA)
285 rt2x00_set_field16(&reg, TXRX_CSR20_BCN_EXPECT_WINDOW, 0); 285 rt2x00_set_field16(&reg, TXRX_CSR20_BCN_EXPECT_WINDOW, 0);
286 else 286 else