diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-14 23:40:34 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-14 23:40:34 -0400 |
| commit | fc943b12e48f9341bce48c2fadf094cc721aab93 (patch) | |
| tree | 8c3244d7f5fae4edbfe0a5103789b0bc5c64f478 /drivers/net/wireless/rt2x00/rt2x00config.c | |
| parent | 72d9794f444734af56ef12833b496326643e2964 (diff) | |
| parent | 4c9adafff7d910f142fe44fae37ed12c6b99f20f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00config.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00config.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00config.c b/drivers/net/wireless/rt2x00/rt2x00config.c index 48608e8cc8b4..f20ca712504f 100644 --- a/drivers/net/wireless/rt2x00/rt2x00config.c +++ b/drivers/net/wireless/rt2x00/rt2x00config.c | |||
| @@ -84,6 +84,8 @@ void rt2x00lib_config_erp(struct rt2x00_dev *rt2x00dev, | |||
| 84 | memset(&erp, 0, sizeof(erp)); | 84 | memset(&erp, 0, sizeof(erp)); |
| 85 | 85 | ||
| 86 | erp.short_preamble = bss_conf->use_short_preamble; | 86 | erp.short_preamble = bss_conf->use_short_preamble; |
| 87 | erp.cts_protection = bss_conf->use_cts_prot; | ||
| 88 | |||
| 87 | erp.ack_timeout = PLCP + get_duration(ACK_SIZE, 10); | 89 | erp.ack_timeout = PLCP + get_duration(ACK_SIZE, 10); |
| 88 | erp.ack_consume_time = SIFS + PLCP + get_duration(ACK_SIZE, 10); | 90 | erp.ack_consume_time = SIFS + PLCP + get_duration(ACK_SIZE, 10); |
| 89 | 91 | ||