From patchwork Tue Feb 18 13:36:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gang ZHAO X-Patchwork-Id: 3670451 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 E117B9F2EC for ; Tue, 18 Feb 2014 13:37:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1696320160 for ; Tue, 18 Feb 2014 13:37:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 321A220103 for ; Tue, 18 Feb 2014 13:37:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755487AbaBRNhR (ORCPT ); Tue, 18 Feb 2014 08:37:17 -0500 Received: from mail-pd0-f182.google.com ([209.85.192.182]:59913 "EHLO mail-pd0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755295AbaBRNhP (ORCPT ); Tue, 18 Feb 2014 08:37:15 -0500 Received: by mail-pd0-f182.google.com with SMTP id v10so16163020pde.41 for ; Tue, 18 Feb 2014 05:37:14 -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=c32vO2qrA6kTdOY9lM7S/mM3c3YeBhg+Mppx9CiZsPg=; b=H+8IQBeK986Ls1A0SFm4XoAl/8SU/7oAXP22nHvMS3orCzWWMAowKZUEw+WxaIg5ND 5CHEFk9n2tY77LpdxHJ96tcBu9y2mGun7Uwc1VOAv52TByVzOfBNlo23b798nKLOYmKT 8wQxx7sfIpBRRQGYLZzFiHzjdbWYBOL3MJVyrToMQM+1BS41Ur/G5ju9f54eveI6uSfv Mh612NX6587VGgq+ioYVViNUSd2Qotkkq2fuXW7KwXFZscGUZz8CX6RVBzHXOh5cZltt ubYYpe78R7WQArGn5RppbWCj36SW+gvvqp+7lT22ewOXIjjoo9C0bpU+kfnupvgISUBl dgHQ== X-Received: by 10.68.242.33 with SMTP id wn1mr9962674pbc.154.1392730634710; Tue, 18 Feb 2014 05:37:14 -0800 (PST) Received: from will.lan ([175.153.40.117]) by mx.google.com with ESMTPSA id vx10sm142544850pac.17.2014.02.18.05.37.11 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Feb 2014 05:37:14 -0800 (PST) From: "Zhao, Gang" To: "John W. Linville" Cc: , Johannes Berg Subject: [PATCH 7/7] ieee80211: remove function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan} Date: Tue, 18 Feb 2014 21:36:03 +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 Function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan} have been replaced with ieee80211_{channel_to_frequency, frequency_to_channel}. There should be no users of the two functions now. So remove them. Cc: Johannes Berg Signed-off-by: Zhao, Gang --- include/linux/ieee80211.h | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index 5f34935..0629904 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h @@ -2308,42 +2308,6 @@ static inline bool ieee80211_is_public_action(struct ieee80211_hdr *hdr, } /** - * ieee80211_dsss_chan_to_freq - get channel center frequency - * @channel: the DSSS channel - * - * Convert IEEE802.11 DSSS channel to the center frequency (MHz). - * Ref IEEE 802.11-2007 section 15.6 - */ -static inline int ieee80211_dsss_chan_to_freq(int channel) -{ - if ((channel > 0) && (channel < 14)) - return 2407 + (channel * 5); - else if (channel == 14) - return 2484; - else - return -1; -} - -/** - * ieee80211_freq_to_dsss_chan - get channel - * @freq: the frequency - * - * Convert frequency (MHz) to IEEE802.11 DSSS channel - * Ref IEEE 802.11-2007 section 15.6 - * - * This routine selects the channel with the closest center frequency. - */ -static inline int ieee80211_freq_to_dsss_chan(int freq) -{ - if ((freq >= 2410) && (freq < 2475)) - return (freq - 2405) / 5; - else if ((freq >= 2482) && (freq < 2487)) - return 14; - else - return -1; -} - -/** * ieee80211_tu_to_usec - convert time units (TU) to microseconds * @tu: the TUs */