Add "wlan" and "ultrawideband" as aliases for "wifi" and "uwb".

I tend to think "wlan" rather than "wifi"; also, it fits in nicely with "wwan".
Also, these aliases are what the kernel uses.

diff --git a/rfkill.8 b/rfkill.8
index da06b270ca2bb5983623cac13358f6cc3733b043..612e366e148bdadc674a1384dc737136f90f11b8 100644 (file)
--- a/rfkill.8
+++ b/rfkill.8
@@ -22,7 +22,8 @@ List the current state of all available rfkill-using devices.
 .TP
 .BI block " index|type"
 Disable the device corresponding to the given index.
-\fItype\fR is one of "all", "wifi", "bluetooth", "uwb", "wimax", "wwan" or "gps".
+\fItype\fR is one of "all", "wifi", "wlan", "bluetooth", "uwb",
+"ultrawideband", "wimax", "wwan" or "gps".
 .TP
 .BI unblock " index|type"
 Enable the device corresponding to the given index. If the device is

diff --git a/rfkill.c b/rfkill.c
index 3f71181b8ede5aa114af35abaa238e00f7de3e77..7b44b5a773e525fcf9575fe53d1c982b06a35525 100644 (file)
--- a/rfkill.c
+++ b/rfkill.c
@@ -200,8 +200,10 @@ struct rfkill_type_str {
 static struct rfkill_type_str rfkill_type_strings[] = {
        {       .type = RFKILL_TYPE_ALL,                .name = "all"   },
        {       .type = RFKILL_TYPE_WLAN,               .name = "wifi"  },
+       {       .type = RFKILL_TYPE_WLAN,               .name = "wlan"  }, /* alias */
        {       .type = RFKILL_TYPE_BLUETOOTH,  .name = "bluetooth"     },
        {       .type = RFKILL_TYPE_UWB,                .name = "uwb"   },
+       {       .type = RFKILL_TYPE_UWB,                .name = "ultrawideband" }, /* alias */
        {       .type = RFKILL_TYPE_WIMAX,              .name = "wimax" },
        {       .type = RFKILL_TYPE_WWAN,               .name = "wwan"  },
        {       .type = RFKILL_TYPE_GPS,                .name = "gps"   },
@@ -222,7 +224,7 @@ static enum rfkill_type rfkill_str_to_type(char *s)
 
 static const char *argv0;
 
-#define BLOCK_PARAMS "{<idx>,all,wifi,bluetooth,uwb,wimax,wwan,gps}"
+#define BLOCK_PARAMS "{<idx>,all,wifi,wlan,bluetooth,uwb,ultrawideband,wimax,wwan,gps}"
 
 static void usage(void)
 {