From patchwork Mon Dec 1 15:51:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arik Nemtsov X-Patchwork-Id: 5413271 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 6DBF19F1CD for ; Mon, 1 Dec 2014 15:51:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 906BD20266 for ; Mon, 1 Dec 2014 15:51:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 641B82026C for ; Mon, 1 Dec 2014 15:51:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753961AbaLAPvm (ORCPT ); Mon, 1 Dec 2014 10:51:42 -0500 Received: from mail-wi0-f175.google.com ([209.85.212.175]:56317 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753685AbaLAPvl (ORCPT ); Mon, 1 Dec 2014 10:51:41 -0500 Received: by mail-wi0-f175.google.com with SMTP id l15so25113944wiw.2 for ; Mon, 01 Dec 2014 07:51:40 -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:in-reply-to :references; bh=X1Z3fi7qeymxtYjm//0wbXxvm790kjjW67v7dNwSrNk=; b=UlKKdaycZ/w8YR1JXcQGCR693W6FDXIWxTZz2RNUgxEtUpGRSSe4+rR1tmRn1cgZH8 YzOsx3ej+eQBUOqMScPWw8Ck9oQvYcK/jSVu3tpQeX0fsTDzjIYPt4hjNZNsdgyrPPhE s8hAusN4hSCQCBf7SIx4WBj5/jqgTSGBEU7oRLeP0lXYiRVjoWwgoos3OIs2bZBNCcri ctz/Bxw7JZFmhjWzVr+pGtFDH+vAAyZ0+0QU7a7xzYLuIYJ7hgT6Vtvfjqh3X6aS6/Ii /vDuAG+wceRBUA4n6wLcD4nu7fVHjhdZQJCDU1o1NXsSCslWO1zUWnm2+Ky+NOQ7MARo 0VgQ== X-Gm-Message-State: ALoCoQkre0IGTb8gk3zpRCyZU2GFQJktv5Q7v24WZN83vcc4Lwk57BunON76474LshMIgr+x8x6y X-Received: by 10.194.176.198 with SMTP id ck6mr93085729wjc.25.1417449100241; Mon, 01 Dec 2014 07:51:40 -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 l10sm42580516wif.20.2014.12.01.07.51.38 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 01 Dec 2014 07:51:39 -0800 (PST) From: Arik Nemtsov To: Cc: Johannes Berg , "Luis R. Rodriguez" , Arik Nemtsov Subject: [PATCH 4/4] iw: support multiple regdom print Date: Mon, 1 Dec 2014 17:51:33 +0200 Message-Id: <1417449093-9470-4-git-send-email-arik@wizery.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1417449093-9470-1-git-send-email-arik@wizery.com> References: <1417449093-9470-1-git-send-email-arik@wizery.com> 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 --- reg.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/reg.c b/reg.c index a02c982..4e4c707 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,7 +222,9 @@ static int print_reg_handler(struct nl_msg *msg, void *arg) printf("\n"); } - return NL_OK; + + printf("\n"); + return NL_SKIP; #undef PARSE_FLAG } @@ -229,5 +237,8 @@ static int handle_reg_get(struct nl80211_state *state, nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, print_reg_handler, NULL); return 0; } -COMMAND(reg, get, NULL, NL80211_CMD_GET_REG, 0, CIB_NONE, handle_reg_get, +COMMAND(reg, get, NULL, NL80211_CMD_GET_REG, NLM_F_DUMP, 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.");