mirror of
https://github.com/torvalds/linux.git
synced 2024-11-14 16:12:02 +00:00
06991c28f3
Here is the big driver core merge for 3.9-rc1
There are two major series here, both of which touch lots of drivers all
over the kernel, and will cause you some merge conflicts:
- add a new function called devm_ioremap_resource() to properly be
able to check return values.
- remove CONFIG_EXPERIMENTAL
If you need me to provide a merged tree to handle these resolutions,
please let me know.
Other than those patches, there's not much here, some minor fixes and
updates.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
iEYEABECAAYFAlEmV0cACgkQMUfUDdst+yncCQCfbmnQZju7kzWXk6PjdFuKspT9
weAAoMCzcAtEzzc4LXuUxxG/sXBVBCjW
=yWAQ
-----END PGP SIGNATURE-----
Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core patches from Greg Kroah-Hartman:
"Here is the big driver core merge for 3.9-rc1
There are two major series here, both of which touch lots of drivers
all over the kernel, and will cause you some merge conflicts:
- add a new function called devm_ioremap_resource() to properly be
able to check return values.
- remove CONFIG_EXPERIMENTAL
Other than those patches, there's not much here, some minor fixes and
updates"
Fix up trivial conflicts
* tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (221 commits)
base: memory: fix soft/hard_offline_page permissions
drivercore: Fix ordering between deferred_probe and exiting initcalls
backlight: fix class_find_device() arguments
TTY: mark tty_get_device call with the proper const values
driver-core: constify data for class_find_device()
firmware: Ignore abort check when no user-helper is used
firmware: Reduce ifdef CONFIG_FW_LOADER_USER_HELPER
firmware: Make user-mode helper optional
firmware: Refactoring for splitting user-mode helper code
Driver core: treat unregistered bus_types as having no devices
watchdog: Convert to devm_ioremap_resource()
thermal: Convert to devm_ioremap_resource()
spi: Convert to devm_ioremap_resource()
power: Convert to devm_ioremap_resource()
mtd: Convert to devm_ioremap_resource()
mmc: Convert to devm_ioremap_resource()
mfd: Convert to devm_ioremap_resource()
media: Convert to devm_ioremap_resource()
iommu: Convert to devm_ioremap_resource()
drm: Convert to devm_ioremap_resource()
...
294 lines
8.6 KiB
Plaintext
294 lines
8.6 KiB
Plaintext
config MAC80211
|
|
tristate "Generic IEEE 802.11 Networking Stack (mac80211)"
|
|
depends on CFG80211
|
|
select CRYPTO
|
|
select CRYPTO_ARC4
|
|
select CRYPTO_AES
|
|
select CRC32
|
|
select AVERAGE
|
|
---help---
|
|
This option enables the hardware independent IEEE 802.11
|
|
networking stack.
|
|
|
|
comment "CFG80211 needs to be enabled for MAC80211"
|
|
depends on CFG80211=n
|
|
|
|
if MAC80211 != n
|
|
|
|
config MAC80211_HAS_RC
|
|
bool
|
|
|
|
config MAC80211_RC_PID
|
|
bool "PID controller based rate control algorithm" if EXPERT
|
|
select MAC80211_HAS_RC
|
|
---help---
|
|
This option enables a TX rate control algorithm for
|
|
mac80211 that uses a PID controller to select the TX
|
|
rate.
|
|
|
|
config MAC80211_RC_MINSTREL
|
|
bool "Minstrel" if EXPERT
|
|
select MAC80211_HAS_RC
|
|
default y
|
|
---help---
|
|
This option enables the 'minstrel' TX rate control algorithm
|
|
|
|
config MAC80211_RC_MINSTREL_HT
|
|
bool "Minstrel 802.11n support" if EXPERT
|
|
depends on MAC80211_RC_MINSTREL
|
|
default y
|
|
---help---
|
|
This option enables the 'minstrel_ht' TX rate control algorithm
|
|
|
|
choice
|
|
prompt "Default rate control algorithm"
|
|
depends on MAC80211_HAS_RC
|
|
default MAC80211_RC_DEFAULT_MINSTREL
|
|
---help---
|
|
This option selects the default rate control algorithm
|
|
mac80211 will use. Note that this default can still be
|
|
overridden through the ieee80211_default_rc_algo module
|
|
parameter if different algorithms are available.
|
|
|
|
config MAC80211_RC_DEFAULT_PID
|
|
bool "PID controller based rate control algorithm"
|
|
depends on MAC80211_RC_PID
|
|
---help---
|
|
Select the PID controller based rate control as the
|
|
default rate control algorithm. You should choose
|
|
this unless you know what you are doing.
|
|
|
|
config MAC80211_RC_DEFAULT_MINSTREL
|
|
bool "Minstrel"
|
|
depends on MAC80211_RC_MINSTREL
|
|
---help---
|
|
Select Minstrel as the default rate control algorithm.
|
|
|
|
|
|
endchoice
|
|
|
|
config MAC80211_RC_DEFAULT
|
|
string
|
|
default "minstrel_ht" if MAC80211_RC_DEFAULT_MINSTREL && MAC80211_RC_MINSTREL_HT
|
|
default "minstrel" if MAC80211_RC_DEFAULT_MINSTREL
|
|
default "pid" if MAC80211_RC_DEFAULT_PID
|
|
default ""
|
|
|
|
endif
|
|
|
|
comment "Some wireless drivers require a rate control algorithm"
|
|
depends on MAC80211 && MAC80211_HAS_RC=n
|
|
|
|
config MAC80211_MESH
|
|
bool "Enable mac80211 mesh networking (pre-802.11s) support"
|
|
depends on MAC80211
|
|
---help---
|
|
This options enables support of Draft 802.11s mesh networking.
|
|
The implementation is based on Draft 2.08 of the Mesh Networking
|
|
amendment. However, no compliance with that draft is claimed or even
|
|
possible, as drafts leave a number of identifiers to be defined after
|
|
ratification. For more information visit http://o11s.org/.
|
|
|
|
config MAC80211_LEDS
|
|
bool "Enable LED triggers"
|
|
depends on MAC80211
|
|
depends on LEDS_CLASS
|
|
select LEDS_TRIGGERS
|
|
---help---
|
|
This option enables a few LED triggers for different
|
|
packet receive/transmit events.
|
|
|
|
config MAC80211_DEBUGFS
|
|
bool "Export mac80211 internals in DebugFS"
|
|
depends on MAC80211 && DEBUG_FS
|
|
---help---
|
|
Select this to see extensive information about
|
|
the internal state of mac80211 in debugfs.
|
|
|
|
Say N unless you know you need this.
|
|
|
|
config MAC80211_MESSAGE_TRACING
|
|
bool "Trace all mac80211 debug messages"
|
|
depends on MAC80211
|
|
---help---
|
|
Select this option to have mac80211 register the
|
|
mac80211_msg trace subsystem with tracepoints to
|
|
collect all debugging messages, independent of
|
|
printing them into the kernel log.
|
|
|
|
The overhead in this option is that all the messages
|
|
need to be present in the binary and formatted at
|
|
runtime for tracing.
|
|
|
|
menuconfig MAC80211_DEBUG_MENU
|
|
bool "Select mac80211 debugging features"
|
|
depends on MAC80211
|
|
---help---
|
|
This option collects various mac80211 debug settings.
|
|
|
|
config MAC80211_NOINLINE
|
|
bool "Do not inline TX/RX handlers"
|
|
depends on MAC80211_DEBUG_MENU
|
|
---help---
|
|
This option affects code generation in mac80211, when
|
|
selected some functions are marked "noinline" to allow
|
|
easier debugging of problems in the transmit and receive
|
|
paths.
|
|
|
|
This option increases code size a bit and inserts a lot
|
|
of function calls in the code, but is otherwise safe to
|
|
enable.
|
|
|
|
If unsure, say N unless you expect to be finding problems
|
|
in mac80211.
|
|
|
|
config MAC80211_VERBOSE_DEBUG
|
|
bool "Verbose debugging output"
|
|
depends on MAC80211_DEBUG_MENU
|
|
---help---
|
|
Selecting this option causes mac80211 to print out
|
|
many debugging messages. It should not be selected
|
|
on production systems as some of the messages are
|
|
remotely triggerable.
|
|
|
|
Do not select this option.
|
|
|
|
config MAC80211_MLME_DEBUG
|
|
bool "Verbose managed MLME output"
|
|
depends on MAC80211_DEBUG_MENU
|
|
---help---
|
|
Selecting this option causes mac80211 to print out
|
|
debugging messages for the managed-mode MLME. It
|
|
should not be selected on production systems as some
|
|
of the messages are remotely triggerable.
|
|
|
|
Do not select this option.
|
|
|
|
config MAC80211_STA_DEBUG
|
|
bool "Verbose station debugging"
|
|
depends on MAC80211_DEBUG_MENU
|
|
---help---
|
|
Selecting this option causes mac80211 to print out
|
|
debugging messages for station addition/removal.
|
|
|
|
Do not select this option.
|
|
|
|
config MAC80211_HT_DEBUG
|
|
bool "Verbose HT debugging"
|
|
depends on MAC80211_DEBUG_MENU
|
|
---help---
|
|
This option enables 802.11n High Throughput features
|
|
debug tracing output.
|
|
|
|
It should not be selected on production systems as some
|
|
of the messages are remotely triggerable.
|
|
|
|
Do not select this option.
|
|
|
|
config MAC80211_IBSS_DEBUG
|
|
bool "Verbose IBSS debugging"
|
|
depends on MAC80211_DEBUG_MENU
|
|
---help---
|
|
Selecting this option causes mac80211 to print out
|
|
very verbose IBSS debugging messages. It should not
|
|
be selected on production systems as those messages
|
|
are remotely triggerable.
|
|
|
|
Do not select this option.
|
|
|
|
config MAC80211_PS_DEBUG
|
|
bool "Verbose powersave mode debugging"
|
|
depends on MAC80211_DEBUG_MENU
|
|
---help---
|
|
Selecting this option causes mac80211 to print out very
|
|
verbose power save mode debugging messages (when mac80211
|
|
is an AP and has power saving stations.)
|
|
It should not be selected on production systems as those
|
|
messages are remotely triggerable.
|
|
|
|
Do not select this option.
|
|
|
|
config MAC80211_MPL_DEBUG
|
|
bool "Verbose mesh peer link debugging"
|
|
depends on MAC80211_DEBUG_MENU
|
|
depends on MAC80211_MESH
|
|
---help---
|
|
Selecting this option causes mac80211 to print out very
|
|
verbose mesh peer link debugging messages (when mac80211
|
|
is taking part in a mesh network).
|
|
It should not be selected on production systems as those
|
|
messages are remotely triggerable.
|
|
|
|
Do not select this option.
|
|
|
|
config MAC80211_MPATH_DEBUG
|
|
bool "Verbose mesh path debugging"
|
|
depends on MAC80211_DEBUG_MENU
|
|
depends on MAC80211_MESH
|
|
---help---
|
|
Selecting this option causes mac80211 to print out very
|
|
verbose mesh path selection debugging messages (when mac80211
|
|
is taking part in a mesh network).
|
|
It should not be selected on production systems as those
|
|
messages are remotely triggerable.
|
|
|
|
Do not select this option.
|
|
|
|
config MAC80211_MHWMP_DEBUG
|
|
bool "Verbose mesh HWMP routing debugging"
|
|
depends on MAC80211_DEBUG_MENU
|
|
depends on MAC80211_MESH
|
|
---help---
|
|
Selecting this option causes mac80211 to print out very
|
|
verbose mesh routing (HWMP) debugging messages (when mac80211
|
|
is taking part in a mesh network).
|
|
It should not be selected on production systems as those
|
|
messages are remotely triggerable.
|
|
|
|
Do not select this option.
|
|
|
|
config MAC80211_MESH_SYNC_DEBUG
|
|
bool "Verbose mesh synchronization debugging"
|
|
depends on MAC80211_DEBUG_MENU
|
|
depends on MAC80211_MESH
|
|
---help---
|
|
Selecting this option causes mac80211 to print out very verbose mesh
|
|
synchronization debugging messages (when mac80211 is taking part in a
|
|
mesh network).
|
|
|
|
Do not select this option.
|
|
|
|
config MAC80211_MESH_PS_DEBUG
|
|
bool "Verbose mesh powersave debugging"
|
|
depends on MAC80211_DEBUG_MENU
|
|
depends on MAC80211_MESH
|
|
---help---
|
|
Selecting this option causes mac80211 to print out very verbose mesh
|
|
powersave debugging messages (when mac80211 is taking part in a
|
|
mesh network).
|
|
|
|
Do not select this option.
|
|
|
|
config MAC80211_TDLS_DEBUG
|
|
bool "Verbose TDLS debugging"
|
|
depends on MAC80211_DEBUG_MENU
|
|
---help---
|
|
Selecting this option causes mac80211 to print out very
|
|
verbose TDLS selection debugging messages (when mac80211
|
|
is a TDLS STA).
|
|
It should not be selected on production systems as those
|
|
messages are remotely triggerable.
|
|
|
|
Do not select this option.
|
|
|
|
config MAC80211_DEBUG_COUNTERS
|
|
bool "Extra statistics for TX/RX debugging"
|
|
depends on MAC80211_DEBUG_MENU
|
|
depends on MAC80211_DEBUGFS
|
|
---help---
|
|
Selecting this option causes mac80211 to keep additional
|
|
and very verbose statistics about TX and RX handler use
|
|
and show them in debugfs.
|
|
|
|
If unsure, say N.
|