Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp405710ybz; Fri, 17 Apr 2020 03:22:29 -0700 (PDT) X-Google-Smtp-Source: APiQypJaf62gweTDpsmfp1oAJB4dUa2HhnK0NpJuvWY1bgWQr7ecwq+noBJYPrvx9UH7y6auhwSg X-Received: by 2002:a17:906:18a1:: with SMTP id c1mr2203881ejf.344.1587118949132; Fri, 17 Apr 2020 03:22:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587118949; cv=none; d=google.com; s=arc-20160816; b=E+amio0uUSA80446FFD4tm548xCsq6gV/lssZ8yKyVdNbFDJoN8/Sj/rjq4jAmGvkl 8WiRgMcWbMCW/QgHM4MA9ziWD929/JFtNaVMQTiK4VB+DnK9Rg3EkpYFJPut2qlpV7pb DrI52ZEMIZJevJdS8k6lzI9aT0zyCjls3lg7GV1c2o2MuXOxJUjEQItV6IcXrMLugBS+ d5Y+IES5FJ77nknYZOLjlrq+JUK1SWaeXKr4R4+VYdc+2FOpkvewdtin0u4SofYcRA5/ S33VtCqwxj5rS8mEZ3KMkoCyMo+EVeMhviy3vdua5SAEl0eu5ClsDZpsx8ZYqJnr9HUZ 3o4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:subject:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:cc:to:from; bh=w6NqwaN/TgwUYQD9uYCpnNxX4Zq7RGP5zcmkIRvMh1E=; b=pLEIlwrIZfxqa5xUUGhXGeeXPbtUrLY+BXGB7pBz2NWOV9ivksQLkjev9HfWbiWs+U HSDaDYFF7KZd2OUJsezrPJuVwGzcn0JSKa6PehNWIrd37CWSiE4YmYIBbWVuQ7CNWqy4 xtDD1IaYuc8b/oTwKuI7kxigXk1LuwgKOV8s//MoHeJsqpHSLRp4l2xshMXM14zKfFtP bc4X/NZqjuvVvp69FwnvC16QM/PHr9vU9tgJZe36bllGWIEdHyG61425xVCBiEYWx+e5 W+xGcnJtmsCGbqxrxHhpoL6SxkH6/C20ykqaZ4PtXUconQhDOAdMByE9njfBc90YZO8Z 7mJg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v5si14528277edq.15.2020.04.17.03.22.06; Fri, 17 Apr 2020 03:22:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729025AbgDQKVy (ORCPT + 99 others); Fri, 17 Apr 2020 06:21:54 -0400 Received: from paleale.coelho.fi ([176.9.41.70]:56574 "EHLO farmhouse.coelho.fi" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728346AbgDQKVx (ORCPT ); Fri, 17 Apr 2020 06:21:53 -0400 Received: from 91-156-6-193.elisa-laajakaista.fi ([91.156.6.193] helo=redipa.ger.corp.intel.com) by farmhouse.coelho.fi with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1jPO87-000Kba-AZ; Fri, 17 Apr 2020 13:21:51 +0300 From: Luca Coelho To: kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org Date: Fri, 17 Apr 2020 13:21:35 +0300 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200417102142.2173014-1-luca@coelho.fi> References: <20200417102142.2173014-1-luca@coelho.fi> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on farmhouse.coelho.fi X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, TVD_RCVD_IP autolearn=ham autolearn_force=no version=3.4.4 Subject: [PATCH 03/10] iwlwifi: nvm: use iwl_nl80211_band_from_channel_idx Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Tova Mussai Use iwl_nl80211_band_from_channel_idx in iwl_parse_nvm_mcc_info Signed-off-by: Tova Mussai Signed-off-by: Luca Coelho --- drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c index 9e9810d2b262..6047b98691eb 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c @@ -1168,8 +1168,7 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg, for (ch_idx = 0; ch_idx < num_of_ch; ch_idx++) { ch_flags = (u16)__le32_to_cpup(channels + ch_idx); - band = (ch_idx < NUM_2GHZ_CHANNELS) ? - NL80211_BAND_2GHZ : NL80211_BAND_5GHZ; + band = iwl_nl80211_band_from_channel_idx(ch_idx); center_freq = ieee80211_channel_to_frequency(nvm_chan[ch_idx], band); new_rule = false; -- 2.25.1