[lkml]   [2013]   [Jun]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the wireless-next tree with the wireless tree
Hi John,

Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/wireless/ath/ath9k/Kconfig between commit 8bb7f167a12a
("ath9k: Use minstrel rate control by default") from the wireless tree
and commit cf657a2bc50d ("ath9k: Remove MAC_DEBUG") from the
wireless-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

Stephen Rothwell

diff --cc drivers/net/wireless/ath/ath9k/Kconfig
index 3c2cbc9,ec33c80..0000000
--- a/drivers/net/wireless/ath/ath9k/Kconfig
+++ b/drivers/net/wireless/ath/ath9k/Kconfig
@@@ -84,25 -84,13 +84,17 @@@ config ATH9K_DFS_CERTIFIE
developed. At this point enabling this option won't do anything
except increase code size.

- config ATH9K_MAC_DEBUG
- bool "Atheros MAC statistics"
- depends on ATH9K_DEBUGFS
- default y
- ---help---
- This option enables collection of statistics for Rx/Tx status
- data and some other MAC related statistics
bool "Atheros ath9k rate control"
depends on ATH9K
- default y
+ default n
Say Y, if you want to use the ath9k specific rate control
- module instead of minstrel_ht.
+ module instead of minstrel_ht. Be warned that there are various
+ issues with the ath9k RC and minstrel is a more robust algorithm.
+ Note that even if this option is selected, "ath9k_rate_control"
+ has to be passed to mac80211 using the module parameter,
+ ieee80211_default_rc_algo.

config ATH9K_HTC
tristate "Atheros HTC based wireless cards support"
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2013-06-07 05:41    [W:0.059 / U:6.520 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site