From patchwork Fri Jan 22 23:35:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Darren Salt X-Patchwork-Id: 74807 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o0MNZd4g018734 for ; Fri, 22 Jan 2010 23:35:40 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755034Ab0AVXfi (ORCPT ); Fri, 22 Jan 2010 18:35:38 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753605Ab0AVXfh (ORCPT ); Fri, 22 Jan 2010 18:35:37 -0500 Received: from anchor-post-3.mail.demon.net ([195.173.77.134]:38597 "EHLO anchor-post-3.mail.demon.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753706Ab0AVXfg (ORCPT ); Fri, 22 Jan 2010 18:35:36 -0500 Received: from youmustbejoking.demon.co.uk ([80.176.152.238] helo=pentagram.youmustbejoking.demon.co.uk) by anchor-post-3.mail.demon.net with esmtp (Exim 4.69) id 1NYT2N-0003kv-n9; Fri, 22 Jan 2010 23:35:35 +0000 Received: from [192.168.0.5] (helo=localhost.localdomain) by pentagram.youmustbejoking.demon.co.uk with esmtp (Exim 4.69) (envelope-from ) id 1NYT2M-0006FB-P6; Fri, 22 Jan 2010 23:35:34 +0000 From: Darren Salt To: Johannes Berg Cc: linux-wireless@vger.kernel.org Subject: [PATCH 1/6] Add "wlan" and "ultrawideband" as aliases for "wifi" and "uwb". Date: Fri, 22 Jan 2010 23:35:25 +0000 Message-Id: <1264203330-20785-1-git-send-email-linux@youmustbejoking.demon.co.uk> X-Mailer: git-send-email 1.6.5 X-SA-Exim-Connect-IP: 192.168.0.5 X-SA-Exim-Mail-From: linux@youmustbejoking.demon.co.uk X-SA-Exim-Scanned: No (on pentagram.youmustbejoking.demon.co.uk); SAEximRunCond expanded to false Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org diff --git a/rfkill.8 b/rfkill.8 index da06b27..612e366 100644 --- 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 3f71181..7b44b5a 100644 --- 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 "{,all,wifi,bluetooth,uwb,wimax,wwan,gps}" +#define BLOCK_PARAMS "{,all,wifi,wlan,bluetooth,uwb,ultrawideband,wimax,wwan,gps}" static void usage(void) {