From patchwork Wed Nov 13 17:54:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luis R. Rodriguez" X-Patchwork-Id: 3179061 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A3151C045B for ; Wed, 13 Nov 2013 17:54:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 935942078B for ; Wed, 13 Nov 2013 17:54:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 716CB2077C for ; Wed, 13 Nov 2013 17:54:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758693Ab3KMRyY (ORCPT ); Wed, 13 Nov 2013 12:54:24 -0500 Received: from mail-we0-f170.google.com ([74.125.82.170]:39017 "EHLO mail-we0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758882Ab3KMRyX (ORCPT ); Wed, 13 Nov 2013 12:54:23 -0500 Received: by mail-we0-f170.google.com with SMTP id p61so790072wes.15 for ; Wed, 13 Nov 2013 09:54:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=MZ+j/pvNYjOzTXQaN7WVSRSzqqpY0v+fhAWcAMfui2o=; b=ubcCuVcfH7wMMiynffL4I+vqFOa/sEo0EsdD7YY1HJpu/isxC672lKkA6OMjHEFVEn myQmDPHsYu8FrX54hinTwFIGL8mMoLLbL35jkIlUGdaT2Cc1fqIFPt8AZHe51nI/zvVQ zFCELO5ElklwLlIWXpV8VQIBL4BsWxi/LJrW+3/Yb9p05foxkrnc/IKGkj3KcFLP7A38 AlqrQqtYB2e31s2jPgmDJCxi2HCMVFn64XNVTUTT1dBuIc3+B315aqKEeZiSlSXO3E1Q ZKQF9cmpcCw5LkZJ3ZjkBJd13jxZu/1y/CkdS+dvhayoEyKyKcrtdym38q19/ajvOfX1 6EvA== X-Received: by 10.194.89.233 with SMTP id br9mr32208755wjb.15.1384365262802; Wed, 13 Nov 2013 09:54:22 -0800 (PST) Received: from mcgrof@gmail.com (thinkpad-luis.rsr.lip6.fr. [132.227.76.46]) by mx.google.com with ESMTPSA id dj8sm57343453wid.2.2013.11.13.09.54.21 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 13 Nov 2013 09:54:22 -0800 (PST) Received: by mcgrof@gmail.com (sSMTP sendmail emulation); Wed, 13 Nov 2013 18:54:20 +0100 From: "Luis R. Rodriguez" To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, "Luis R. Rodriguez" Subject: [PATCH 4/5] cfg80211: replace print_dfs_region() with reg_dfs_region_str() helper Date: Wed, 13 Nov 2013 18:54:05 +0100 Message-Id: <1384365246-24768-5-git-send-email-mcgrof@do-not-panic.com> X-Mailer: git-send-email 1.8.4.rc3 In-Reply-To: <1384365246-24768-1-git-send-email-mcgrof@do-not-panic.com> References: <1384365246-24768-1-git-send-email-mcgrof@do-not-panic.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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 This lets us later reuse the more generic reg_dfs_region_str(). Signed-off-by: Luis R. Rodriguez --- net/wireless/reg.c | 41 ++++++++++++++++------------------------- 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 740eccb..ec54e1a 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -120,6 +120,21 @@ static const struct ieee80211_regdomain *get_wiphy_regdom(struct wiphy *wiphy) return rtnl_dereference(wiphy->regd); } +static const char *reg_dfs_region_str(enum nl80211_dfs_regions dfs_region) +{ + switch (dfs_region) { + case NL80211_DFS_UNSET: + return "unset"; + case NL80211_DFS_FCC: + return "FCC"; + case NL80211_DFS_ETSI: + return "ETSI"; + case NL80211_DFS_JP: + return "JP"; + } + return "Unknown"; +} + static void rcu_free_regdom(const struct ieee80211_regdomain *r) { if (!r) @@ -2146,30 +2161,6 @@ bool reg_supported_dfs_region(enum nl80211_dfs_regions dfs_region) } } -static void print_dfs_region(enum nl80211_dfs_regions dfs_region) -{ - if (!dfs_region) - return; - - switch (dfs_region) { - case NL80211_DFS_UNSET: - pr_info(" DFS Master region unset"); - break; - case NL80211_DFS_FCC: - pr_info(" DFS Master region FCC"); - break; - case NL80211_DFS_ETSI: - pr_info(" DFS Master region ETSI"); - break; - case NL80211_DFS_JP: - pr_info(" DFS Master region JP"); - break; - default: - pr_info(" DFS Master region Unknown"); - break; - } -} - static void print_regdomain(const struct ieee80211_regdomain *rd) { struct regulatory_request *lr = get_last_request(); @@ -2201,7 +2192,7 @@ static void print_regdomain(const struct ieee80211_regdomain *rd) } } - print_dfs_region(rd->dfs_region); + pr_info(" DFS Master region: %s", reg_dfs_region_str(rd->dfs_region)); print_rd_rules(rd); }