From patchwork Tue Feb 18 13:35:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gang ZHAO X-Patchwork-Id: 3670411 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 7DAE59F2EC for ; Tue, 18 Feb 2014 13:37:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 99CA720163 for ; Tue, 18 Feb 2014 13:37:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BA7FB20160 for ; Tue, 18 Feb 2014 13:36:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755452AbaBRNg5 (ORCPT ); Tue, 18 Feb 2014 08:36:57 -0500 Received: from mail-pb0-f54.google.com ([209.85.160.54]:61580 "EHLO mail-pb0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755170AbaBRNg5 (ORCPT ); Tue, 18 Feb 2014 08:36:57 -0500 Received: by mail-pb0-f54.google.com with SMTP id uo5so16786611pbc.13 for ; Tue, 18 Feb 2014 05:36:56 -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=dL67dsf03DhAqpvJxPyVFYLd7ZIqvFHObXABLX9BD5c=; b=BZPMqKDLzJCiGEj5Fj0Ho7QMjCgwz+yRNf0ImfMuBl8cnzwJ1y4tG+gvDKjYmJrcvN 0QYT1WXJFmn7TzMjUy6e/oGmG61G95UwhSNLKtbgqRN2HPNyGLxwXaPu3lzxpRFlw90e DDTVWLMNncRkDtbanNkwYUAld8+6hIE8J2h1O5vU2n77pCB/Vn6a4UW2l7qqqggDAjHJ LYJi7TAAa5WwadJAkCSJ1nIuWsQqmlJy94fsb3E/cIThYxbyCBamp1enTqzjQtERAU4w PBoJ/L3DZk3WKrDdk8MsoX4+j2L+x/4M9jdVrk6t8dbagXUU9/Ahjh7AKh5lfmaGSUSg GKMw== X-Received: by 10.68.244.8 with SMTP id xc8mr9940478pbc.164.1392730616493; Tue, 18 Feb 2014 05:36:56 -0800 (PST) Received: from will.lan ([175.153.40.117]) by mx.google.com with ESMTPSA id vx10sm142544850pac.17.2014.02.18.05.36.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Feb 2014 05:36:56 -0800 (PST) From: "Zhao, Gang" To: "John W. Linville" Cc: , Arnaldo Carvalho de Melo Subject: [PATCH 3/7] wl3501_cs: replace function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan} Date: Tue, 18 Feb 2014 21:35:59 +0800 Message-Id: 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: Arnaldo Carvalho de Melo Signed-off-by: Zhao, Gang --- drivers/net/wireless/wl3501_cs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c index d24d4a9..5c33744 100644 --- a/drivers/net/wireless/wl3501_cs.c +++ b/drivers/net/wireless/wl3501_cs.c @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include @@ -1454,7 +1454,8 @@ static int wl3501_get_freq(struct net_device *dev, struct iw_request_info *info, { struct wl3501_card *this = netdev_priv(dev); - wrqu->freq.m = ieee80211_dsss_chan_to_freq(this->chan) * 100000; + wrqu->freq.m = 100000 * + ieee80211_channel_to_frequency(this->chan, IEEE80211_BAND_2GHZ); wrqu->freq.e = 1; return 0; }