From patchwork Tue Feb 18 13:36:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gang ZHAO X-Patchwork-Id: 3670421 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 95E7BBF13A for ; Tue, 18 Feb 2014 13:37:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BC2B720163 for ; Tue, 18 Feb 2014 13:37:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 99F9620160 for ; Tue, 18 Feb 2014 13:37:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755458AbaBRNhF (ORCPT ); Tue, 18 Feb 2014 08:37:05 -0500 Received: from mail-pd0-f176.google.com ([209.85.192.176]:58928 "EHLO mail-pd0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755170AbaBRNhE (ORCPT ); Tue, 18 Feb 2014 08:37:04 -0500 Received: by mail-pd0-f176.google.com with SMTP id w10so16197110pde.7 for ; Tue, 18 Feb 2014 05:37:04 -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=0yotD+zx1wmRHTpZuvaza4VZm7gni+wzEUxa0OwPpuo=; b=ZNPZVuSajWjXGl5cqLNcKTX/+fQ8QWUPMeLxpZ0/iYIlb/M3QvLd8tPCepOYhXm9vC GpbQHNLoVxbhKR864WxysOQhG7ONvEljhdMZHIWlb2abwIBbPs9zKdvRCYeIsMTwmiPi WG1CvmV7Rj4X8iSF0xn1wRi5VxJlNROF6FNaxa0o4aj3uYkTIPTsUKYsQ9w4ONkXxbxW 1eQrdr/h757k3JXQNjmHoY20CnS+KgHwqcfPj0yoBXgmpMWgxSvKJ4gKLGXz4Am5Qykn vGPYlM/PtoOk+8n7NB39IY1veDn+1NWYcNy3NPEWUWyZkzSe1tKEUaHA34vb7Lb8EIrf jxyA== X-Received: by 10.68.106.130 with SMTP id gu2mr32779332pbb.59.1392730624061; Tue, 18 Feb 2014 05:37:04 -0800 (PST) Received: from will.lan ([175.153.40.117]) by mx.google.com with ESMTPSA id vx10sm142544850pac.17.2014.02.18.05.36.58 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Feb 2014 05:37:03 -0800 (PST) From: "Zhao, Gang" To: "John W. Linville" Cc: , Jussi Kivilinna Subject: [PATCH 4/7] rndis_wlan: replace function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan} Date: Tue, 18 Feb 2014 21:36:00 +0800 Message-Id: <739118d37ea1665be929e90dc656a02f32ba7d7b.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}. File has already been included. It's safe to use IEEE80211_BAND_2GHZ here. This change is a preparation for the removal of function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}. Cc: Jussi Kivilinna Signed-off-by: Zhao, Gang --- drivers/net/wireless/rndis_wlan.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c index 2e89a86..39d22a1 100644 --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c @@ -1290,7 +1290,8 @@ static int set_channel(struct usbnet *usbdev, int channel) if (is_associated(usbdev)) return 0; - dsconfig = ieee80211_dsss_chan_to_freq(channel) * 1000; + dsconfig = 1000 * + ieee80211_channel_to_frequency(channel, IEEE80211_BAND_2GHZ); len = sizeof(config); ret = rndis_query_oid(usbdev,