From patchwork Tue Feb 18 13:35:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gang ZHAO X-Patchwork-Id: 3670401 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 0350EBF13A for ; Tue, 18 Feb 2014 13:36:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2B7D620163 for ; Tue, 18 Feb 2014 13:36:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 167FD20160 for ; Tue, 18 Feb 2014 13:36:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755435AbaBRNgu (ORCPT ); Tue, 18 Feb 2014 08:36:50 -0500 Received: from mail-pa0-f49.google.com ([209.85.220.49]:56898 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755170AbaBRNgu (ORCPT ); Tue, 18 Feb 2014 08:36:50 -0500 Received: by mail-pa0-f49.google.com with SMTP id hz1so16550975pad.8 for ; Tue, 18 Feb 2014 05:36:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=0vdhSCNRkHobs87suJDkAAd2GnK/IrTNRez/bsLBzYc=; b=WHyVhes+ShfJ2NCsHKKm2Kd9UD5tBXCLs9k7J7XuufWS5OA8DG6DdwmDgYGXPW4Bs8 9cDyG0fdUZhOQW3n0QfyN2zGiVBYaiebAfGoM/N10l8IKG0SgY1WTYYVmoxh6bZpq6cq TtfyGYZ3vtVdgs7jydsi0jQ38YT+Lyq1dnLF4xAfh5D6T6egrS5iU21pl8mlicihMavm 0on+RKOaGgy2qoSFbBTadoqFKaOVGE5ASvnt+Gaj47Z/z5kqYpD6PIdjg1HqlYM+glhe 3Zo5jljJq1Ry8mAIWBhxetHmUNmyy0ZJZKg6H125OCYtnDWDj1B0XWf3ioeVQ5JqE8Xw dYPw== X-Received: by 10.68.164.229 with SMTP id yt5mr2548390pbb.28.1392730609888; Tue, 18 Feb 2014 05:36:49 -0800 (PST) Received: from will.lan ([175.153.40.117]) by mx.google.com with ESMTPSA id vx10sm142544850pac.17.2014.02.18.05.36.46 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Feb 2014 05:36:49 -0800 (PST) From: "Zhao, Gang" To: "John W. Linville" Cc: , Simon Kelley Subject: [PATCH 2/7] atmel: replace function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan} Date: Tue, 18 Feb 2014 21:35:58 +0800 Message-Id: <932b911b4d6dd9f111bd50806e5ec84a7e5fae1a.1392728354.git.gamerh2o@gmail.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: References: In-Reply-To: References: Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 Replace ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan} with more generic ieee80211_{channel_to_frequency, frequency_to_channel}. Include for the defination of IEEE80211_BAND_2GHZ. Because includes , so we can replace with . This change is a preparation for the removal of function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}. Cc: Simon Kelley Signed-off-by: Zhao, Gang --- drivers/net/wireless/atmel.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c index bf93ea8..1fe41af 100644 --- a/drivers/net/wireless/atmel.c +++ b/drivers/net/wireless/atmel.c @@ -67,7 +67,7 @@ #include #include #include -#include +#include #include "atmel.h" #define DRIVER_MAJOR 0 @@ -2273,7 +2273,7 @@ static int atmel_set_freq(struct net_device *dev, /* Hack to fall through... */ fwrq->e = 0; - fwrq->m = ieee80211_freq_to_dsss_chan(f); + fwrq->m = ieee80211_frequency_to_channel(f); } /* Setting by channel number */ if ((fwrq->m > 1000) || (fwrq->e > 0)) @@ -2434,8 +2434,8 @@ static int atmel_get_range(struct net_device *dev, range->freq[k].i = i; /* List index */ /* Values in MHz -> * 10^5 * 10 */ - range->freq[k].m = (ieee80211_dsss_chan_to_freq(i) * - 100000); + range->freq[k].m = 100000 * + ieee80211_channel_to_frequency(i, IEEE80211_BAND_2GHZ); range->freq[k++].e = 1; } range->num_frequency = k;