diff options
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00config.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00config.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00config.c b/drivers/net/wireless/rt2x00/rt2x00config.c index 3501788ab498..40a201e2e151 100644 --- a/drivers/net/wireless/rt2x00/rt2x00config.c +++ b/drivers/net/wireless/rt2x00/rt2x00config.c | |||
@@ -94,17 +94,6 @@ void rt2x00lib_config_erp(struct rt2x00_dev *rt2x00dev, | |||
94 | erp.difs = bss_conf->use_short_slot ? SHORT_DIFS : DIFS; | 94 | erp.difs = bss_conf->use_short_slot ? SHORT_DIFS : DIFS; |
95 | erp.eifs = bss_conf->use_short_slot ? SHORT_EIFS : EIFS; | 95 | erp.eifs = bss_conf->use_short_slot ? SHORT_EIFS : EIFS; |
96 | 96 | ||
97 | erp.ack_timeout = PLCP + erp.difs + GET_DURATION(ACK_SIZE, 10); | ||
98 | erp.ack_consume_time = SIFS + PLCP + GET_DURATION(ACK_SIZE, 10); | ||
99 | |||
100 | if (bss_conf->use_short_preamble) { | ||
101 | erp.ack_timeout += SHORT_PREAMBLE; | ||
102 | erp.ack_consume_time += SHORT_PREAMBLE; | ||
103 | } else { | ||
104 | erp.ack_timeout += PREAMBLE; | ||
105 | erp.ack_consume_time += PREAMBLE; | ||
106 | } | ||
107 | |||
108 | erp.basic_rates = bss_conf->basic_rates; | 97 | erp.basic_rates = bss_conf->basic_rates; |
109 | erp.beacon_int = bss_conf->beacon_int; | 98 | erp.beacon_int = bss_conf->beacon_int; |
110 | 99 | ||