diff options
| author | John W. Linville <linville@tuxdriver.com> | 2009-11-11 13:04:42 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-11 13:04:42 -0800 |
| commit | ddd21046e7b5e112b5a4722b7e071ae9d4c96a2b (patch) | |
| tree | 8402be8bd11e403690fd20f28d2c0dd24ba62a27 | |
| parent | 2071a0084a0323697b7d6fd5a98982194bd6929f (diff) | |
| download | op-kernel-dev-ddd21046e7b5e112b5a4722b7e071ae9d4c96a2b.zip op-kernel-dev-ddd21046e7b5e112b5a4722b7e071ae9d4c96a2b.tar.gz | |
iwlwifi: fix iwl1000 "RTS/CTS for HT" merge damage
I may have botched my merge conflict resolution instructions for Dave...
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-1000.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c index 1e387b9..8f82537 100644 --- a/drivers/net/wireless/iwlwifi/iwl-1000.c +++ b/drivers/net/wireless/iwlwifi/iwl-1000.c @@ -170,6 +170,7 @@ struct iwl_cfg iwl1000_bgn_cfg = { .shadow_ram_support = false, .ht_greenfield_support = true, .led_compensation = 51, + .use_rts_for_ht = true, /* use rts/cts protection */ .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, .support_ct_kill_exit = true, }; |
