Return-path: 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) 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: (sfid-20140218_143701_058994_DB8BF968) In-Reply-To: References: In-Reply-To: References: Sender: linux-wireless-owner@vger.kernel.org List-ID: 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; } -- 1.8.5.3