From patchwork Wed Nov 13 17:54:02 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: 3179031 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 ACDB1C045B for ; Wed, 13 Nov 2013 17:54:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AA87B2078F for ; Wed, 13 Nov 2013 17:54:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 87CCC2077C for ; Wed, 13 Nov 2013 17:54:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758818Ab3KMRyO (ORCPT ); Wed, 13 Nov 2013 12:54:14 -0500 Received: from mail-we0-f181.google.com ([74.125.82.181]:37692 "EHLO mail-we0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758788Ab3KMRyN (ORCPT ); Wed, 13 Nov 2013 12:54:13 -0500 Received: by mail-we0-f181.google.com with SMTP id w61so768245wes.40 for ; Wed, 13 Nov 2013 09:54:12 -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=4G2eqangAjN1ElJ4GvaG7oHS2ACIY9ERKK48eaFswt4=; b=jpmJZUedIWVcj9LvlGvsNDZKKyW18Zb8P9QR7DkU8SmBJobDiOeJrdrao6qdEe/oke gdZnmwY/0NBS4BGE8+aOt2j73GVMb0CdKJPnu4q+zNySrA9BBw9J3qAqFNMGBHZrZ/gb +/SanNLYJZq5YopPepBt1TiKgSyBFRwYGn8N4QNvQEkhDsL7G08M7a8pepcP7bEIp1L4 Sphrb0X9oPOD+aShB0K0gSb3iKrLYOnLBNJm4/MHmhJlEj7eg+M6VxcmCsBxTrXEuk24 +VX9tBJ3h9ssktiSe3EVFJ96NFEsVGzo0aBbomUxJge6ersF0p/AINm4sw9C+Pq0s5tp 81Vw== X-Received: by 10.194.47.236 with SMTP id g12mr168174wjn.92.1384365252035; Wed, 13 Nov 2013 09:54:12 -0800 (PST) Received: from mcgrof@gmail.com (thinkpad-luis.rsr.lip6.fr. [132.227.76.46]) by mx.google.com with ESMTPSA id dj8sm57344258wid.2.2013.11.13.09.54.10 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 13 Nov 2013 09:54:11 -0800 (PST) Received: by mcgrof@gmail.com (sSMTP sendmail emulation); Wed, 13 Nov 2013 18:54:09 +0100 From: "Luis R. Rodriguez" To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, "Luis R. Rodriguez" Subject: [PATCH 1/5] cfg80211: use enum nl80211_dfs_regions for dfs_region everywhere Date: Wed, 13 Nov 2013 18:54:02 +0100 Message-Id: <1384365246-24768-2-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 u8 was used in some other places, just stick to the enum, this forces us to express the values that are expected. Signed-off-by: Luis R. Rodriguez --- include/net/regulatory.h | 4 ++-- net/wireless/nl80211.c | 2 +- net/wireless/reg.c | 4 ++-- net/wireless/reg.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/net/regulatory.h b/include/net/regulatory.h index 7e49cf6..ab0bee0 100644 --- a/include/net/regulatory.h +++ b/include/net/regulatory.h @@ -79,7 +79,7 @@ struct regulatory_request { enum nl80211_reg_initiator initiator; enum nl80211_user_reg_hint_type user_reg_hint_type; char alpha2[2]; - u8 dfs_region; + enum nl80211_dfs_regions dfs_region; bool intersect; bool processed; enum environment_cap country_ie_env; @@ -157,7 +157,7 @@ struct ieee80211_regdomain { struct rcu_head rcu_head; u32 n_reg_rules; char alpha2[2]; - u8 dfs_region; + enum nl80211_dfs_regions dfs_region; struct ieee80211_reg_rule reg_rules[]; }; diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 3f8c364..c33b374 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -5079,7 +5079,7 @@ static int nl80211_set_reg(struct sk_buff *skb, struct genl_info *info) char *alpha2 = NULL; int rem_reg_rules = 0, r = 0; u32 num_rules = 0, rule_idx = 0, size_of_regd; - u8 dfs_region = 0; + enum nl80211_dfs_regions dfs_region = NL80211_DFS_UNSET; struct ieee80211_regdomain *rd = NULL; if (!info->attrs[NL80211_ATTR_REG_ALPHA2]) diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 067c1f6..2796b62 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -2115,7 +2115,7 @@ static void print_rd_rules(const struct ieee80211_regdomain *rd) } } -bool reg_supported_dfs_region(u8 dfs_region) +bool reg_supported_dfs_region(enum nl80211_dfs_regions dfs_region) { switch (dfs_region) { case NL80211_DFS_UNSET: @@ -2130,7 +2130,7 @@ bool reg_supported_dfs_region(u8 dfs_region) } } -static void print_dfs_region(u8 dfs_region) +static void print_dfs_region(enum nl80211_dfs_regions dfs_region) { if (!dfs_region) return; diff --git a/net/wireless/reg.h b/net/wireless/reg.h index b4076ba..cc4c2c0 100644 --- a/net/wireless/reg.h +++ b/net/wireless/reg.h @@ -20,7 +20,7 @@ extern const struct ieee80211_regdomain __rcu *cfg80211_regdomain; bool reg_is_valid_request(const char *alpha2); bool is_world_regdom(const char *alpha2); -bool reg_supported_dfs_region(u8 dfs_region); +bool reg_supported_dfs_region(enum nl80211_dfs_regions dfs_region); int regulatory_hint_user(const char *alpha2, enum nl80211_user_reg_hint_type user_reg_hint_type);