summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Clausen <andrew.p.clausen@gmail.com>2015-01-09 21:24:55 +0100
committerJohannes Berg <johannes.berg@intel.com>2015-01-09 23:22:12 +0100
commit0efbb786f1a3e13d28861ff41aae8dc4be314608 (patch)
tree944ba154e53160e80cec8ff7c7a0264c18830128
parentmac80211: fix handling TIM IE when stations disconnect (diff)
downloadlinux-0efbb786f1a3e13d28861ff41aae8dc4be314608.tar.xz
linux-0efbb786f1a3e13d28861ff41aae8dc4be314608.zip
rfkill: document rfkill module parameters
Document the rfkill module parameters default_state and master_switch_mode. Signed-off-by: Andrew Clausen <andrew.p.clausen@gmail.com> [rewrite commit message] Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r--Documentation/kernel-parameters.txt12
-rw-r--r--Documentation/rfkill.txt3
2 files changed, 15 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index eacb2e0397ae..f55d4658b079 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -3180,6 +3180,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
diff --git a/Documentation/rfkill.txt b/Documentation/rfkill.txt
index 427e89712f4a..2ee6ef9a6554 100644
--- a/Documentation/rfkill.txt
+++ b/Documentation/rfkill.txt
@@ -25,6 +25,9 @@ whether they can be changed or not:
- soft block: writable radio block (need not be readable) that is set by
the system software.
+The rfkill subsystem has two parameters, rfkill.default_state and
+rfkill.master_switch_mode, which are documented in kernel-parameters.txt.
+
2. Implementation details