* [PATCH] iwlwifi: fix iwl1000 "RTS/CTS for HT" merge damage
@ 2009-11-11 20:48 John W. Linville
2009-11-11 21:04 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: John W. Linville @ 2009-11-11 20:48 UTC (permalink / raw)
To: netdev; +Cc: davem, John W. Linville
I may have botched my merge conflict resolution instructions for Dave...
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
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,
};
--
1.6.2.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] iwlwifi: fix iwl1000 "RTS/CTS for HT" merge damage
2009-11-11 20:48 [PATCH] iwlwifi: fix iwl1000 "RTS/CTS for HT" merge damage John W. Linville
@ 2009-11-11 21:04 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2009-11-11 21:04 UTC (permalink / raw)
To: linville; +Cc: netdev
From: "John W. Linville" <linville@tuxdriver.com>
Date: Wed, 11 Nov 2009 15:48:26 -0500
> I may have botched my merge conflict resolution instructions for Dave...
>
> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Applied, thanks John.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-11-11 21:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-11 20:48 [PATCH] iwlwifi: fix iwl1000 "RTS/CTS for HT" merge damage John W. Linville
2009-11-11 21:04 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).