From patchwork Mon Dec 15 16:44:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arik Nemtsov X-Patchwork-Id: 5495731 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B50359F30B for ; Mon, 15 Dec 2014 16:44:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CEAB120A15 for ; Mon, 15 Dec 2014 16:44:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D461820A14 for ; Mon, 15 Dec 2014 16:44:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750998AbaLOQo2 (ORCPT ); Mon, 15 Dec 2014 11:44:28 -0500 Received: from mail-wg0-f49.google.com ([74.125.82.49]:55737 "EHLO mail-wg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750764AbaLOQo1 (ORCPT ); Mon, 15 Dec 2014 11:44:27 -0500 Received: by mail-wg0-f49.google.com with SMTP id n12so15012341wgh.8 for ; Mon, 15 Dec 2014 08:44:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=7+WoYGYl+ZH4m4dLf1LkU4iYoZQqLUpG7kPxS4V4OBQ=; b=Pam9pnN/yUZ/bZIg46BxX2cUau43SQCbgagwWYcY+m/2AO7NhtzGPYBD8/zbjrO+LF lDmgBGXvNx61+wCEkYW1nyOBLoSUW77Liq3BGO4foCVT7OMUgp+ncRTO+hfmVftmkn6w HF4K/i7E6ZEJSnF5n/z7jBnNA8kLdCJ0W94lw7ZKuEbF9NhvJQ6+4NLdADFYjmB1nH+N jxB36oOMVIrPWU0wNREA71J4G/mnfM8aRganIbJgGuiMJ+4EZVukT2O+Mi1UtDh3FMZR DcCSfX8UBfrc/JWDFCmYjI3rCL6ipCzLnAWbqZDHbJJglzL80N12jCEIMdY6sYXidmOT xH0Q== X-Gm-Message-State: ALoCoQnrknp3s75Mn7vIvHM2GhZxJHkuyX+WUwPs+0ITGfUEzRRR6+KBJfYBN5ByFzkYLwPaQ50h X-Received: by 10.194.85.83 with SMTP id f19mr55210204wjz.20.1418661865812; Mon, 15 Dec 2014 08:44:25 -0800 (PST) Received: from athena.amr.corp.intel.com (85-250-108-142.bb.netvision.net.il. [85.250.108.142]) by mx.google.com with ESMTPSA id cz3sm13660703wjb.23.2014.12.15.08.44.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 15 Dec 2014 08:44:24 -0800 (PST) From: Arik Nemtsov To: Cc: Johannes Berg , Arik Nemtsov Subject: [PATCH v2] iw: support multiple regdom print Date: Mon, 15 Dec 2014 18:44:23 +0200 Message-Id: <1418661863-2630-1-git-send-email-arik@wizery.com> X-Mailer: git-send-email 1.9.1 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When a phy is given, print only its regdomain. Otherwise, use the newly implement dump functionality to print all regdomains in the system. Signed-off-by: Arik Nemtsov --- v2: fix reg get for older kernels reg.c | 40 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/reg.c b/reg.c index a02c982..0aef7ba 100644 --- a/reg.c +++ b/reg.c @@ -114,7 +114,6 @@ COMMAND(reg, set, "", "Notify the kernel about the current regulatory domain."); static int print_reg_handler(struct nl_msg *msg, void *arg) - { #define PARSE_FLAG(nl_flag, string_value) do { \ if ((flags & nl_flag)) { \ @@ -150,6 +149,13 @@ static int print_reg_handler(struct nl_msg *msg, void *arg) return NL_SKIP; } + if (tb_msg[NL80211_ATTR_WIPHY]) + printf("phy#%d%s\n", nla_get_u32(tb_msg[NL80211_ATTR_WIPHY]), + tb_msg[NL80211_ATTR_WIPHY_SELF_MANAGED_REG] ? + " (self-managed)" : ""); + else + printf("global\n"); + if (tb_msg[NL80211_ATTR_DFS_REGION]) dfs_domain = nla_get_u8(tb_msg[NL80211_ATTR_DFS_REGION]); else @@ -216,18 +222,44 @@ static int print_reg_handler(struct nl_msg *msg, void *arg) printf("\n"); } - return NL_OK; + + printf("\n"); + return NL_SKIP; #undef PARSE_FLAG } +static int handle_reg_dump(struct nl80211_state *state, + struct nl_cb *cb, + struct nl_msg *msg, + int argc, char **argv, + enum id_input id) +{ + nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, print_reg_handler, NULL); + return 0; +} + static int handle_reg_get(struct nl80211_state *state, struct nl_cb *cb, struct nl_msg *msg, int argc, char **argv, enum id_input id) { - nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, print_reg_handler, NULL); - return 0; + char *dump_args[] = { "reg", "dump" }; + int err; + + err = handle_cmd(state, CIB_NONE, 2, dump_args); + /* dump might fail since it's not supported on older kernels */ + if (err == -EOPNOTSUPP) { + nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, print_reg_handler, + NULL); + return 0; + } + + return err; } COMMAND(reg, get, NULL, NL80211_CMD_GET_REG, 0, CIB_NONE, handle_reg_get, "Print out the kernel's current regulatory domain information."); +COMMAND(reg, get, NULL, NL80211_CMD_GET_REG, 0, CIB_PHY, handle_reg_get, + "Print out the devices' current regulatory domain information."); +HIDDEN(reg, dump, NULL, NL80211_CMD_GET_REG, NLM_F_DUMP, CIB_NONE, + handle_reg_dump);