diff options
| author | David S. Miller <davem@davemloft.net> | 2015-01-15 19:16:56 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-15 19:16:56 -0500 |
| commit | 27f097177defdd5858f03500e4b5aa8a97b1627b (patch) | |
| tree | 186ea28b6f15075df1803acbab7b5a0e9f21cc31 /Documentation/kernel-parameters.txt | |
| parent | 615612dc4e583ae5eeb8eb1ece2d3c70be72296d (diff) | |
| parent | baf1b99ba169bdd3324ac9d99bc2a00c25534429 (diff) | |
| download | linux-27f097177defdd5858f03500e4b5aa8a97b1627b.tar.gz linux-27f097177defdd5858f03500e4b5aa8a97b1627b.tar.bz2 linux-27f097177defdd5858f03500e4b5aa8a97b1627b.zip | |
Merge tag 'mac80211-next-for-davem-2015-01-15' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Here's a big pile of changes for this round.
We have
* a lot of regulatory code changes to deal with the
way newer Intel devices handle this
* a change to drop packets while disconnecting from
an AP instead of trying to wait for them
* a new attempt at improving the tailroom accounting
to not kick in too much for performance reasons
* improvements in wireless link statistics
* many other small improvements and small fixes that
didn't seem necessary for 3.19 (e.g. in hwsim which
is testing only code)
Conflicts:
drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
Minor overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 4df73da11adc..cdb815e833b5 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -3206,6 +3206,18 @@ bytes respectively. Such letter suffixes can also be entirely omitted. retain_initrd [RAM] Keep initrd memory after extraction + rfkill.default_state= + 0 "airplane mode". All wifi, bluetooth, wimax, gps, fm, + etc. communication is blocked by default. + 1 Unblocked. + + rfkill.master_switch_mode= + 0 The "airplane mode" button does nothing. + 1 The "airplane mode" button toggles between everything + blocked and the previous configuration. + 2 The "airplane mode" button toggles between everything + blocked and everything unblocked. + rhash_entries= [KNL,NET] Set number of hash buckets for route cache |