From nobody Wed Feb 11 03:42:01 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2897FC7EE25 for ; Thu, 8 Jun 2023 06:52:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235010AbjFHGw0 (ORCPT ); Thu, 8 Jun 2023 02:52:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37194 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235011AbjFHGwY (ORCPT ); Thu, 8 Jun 2023 02:52:24 -0400 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 73392198B for ; Wed, 7 Jun 2023 23:52:22 -0700 (PDT) Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-9786c0cbfdcso5393666b.1 for ; Wed, 07 Jun 2023 23:52:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686207141; x=1688799141; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=FG5d29CrGVCy3fwMc6JWla5/4zbh1hMHL9JL7ITCxvY=; b=Z1REewAzAWNqwGy1u0+Mjb+fOCd85z11Q3TOJhkkjdpfZHb431yp0QYK8gguNeMJEq ZHgOmt3e+xrJeWxRRke3QlTMOPt8Si4qi8Gj4GNqRJErQ7+FXZ5puwXOwub3oulYUoaB mxDoVVqTALWIyo8UKFbK8WSN+Z4nAEPp8quJL6ChVLoaJGTbK59o5cf+0mtQLJxjQytm /8hJwtNtFHE5Cz1kwTI5HWokiDRyCTi0OvrzxuVG//cBZyE2R+07i9i2LKVCyVGY2ZvH NqoOzK9VZ26mEJlg0ba2VYiYbCRm4ql5F4nSuom9SCZXuHTDD2Yrf+D9omgEDwc4atGW YngA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686207141; x=1688799141; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=FG5d29CrGVCy3fwMc6JWla5/4zbh1hMHL9JL7ITCxvY=; b=eIzL82B4sIoD1kIHirKdJZNOBE5ByDbDNLPrqDgSpjQQHLZMYfqPPoQdfdPw/5ywmb SCwKX6rzhKjr1l75nuUZFYZdo/7MxTjMXwWeXxfz082Aa8adcE/0lwni0i96W6PgmaH5 lE8nR6T1PzeD8RriTpqG+ctVwrP3nJUjNM2ek3wQpIZtEgwnU2or0L9gKZ6RX/5xx+ol RmZNHfQJuE9/PY6UDjR0ZbSJLQ0/3xVYkgpF/3Hr7jNlTxqrwEJeYb0LKnQQEm4p50vp M/qFgyHGZ56/1WoxNoqqXvnNJTWH09euDPiUxl2Od/puuYApwOiY0qnL92XFW8S38m/D 1iJw== X-Gm-Message-State: AC+VfDyG6qWLZjJ5x4rBHGixOvFAPTf2HDTOMxYKtXh/TowusHmqIEr/ p2psRQra1xBQRI93QVrrpZ8= X-Google-Smtp-Source: ACHHUZ6RuYcjwjN7cv5K/wAtu8Nflib2VSPcfswegxfDvNW2dWFqUe4GJOKa4jsmuFU+VEz8RQbgKQ== X-Received: by 2002:a17:906:649b:b0:975:c046:dd34 with SMTP id e27-20020a170906649b00b00975c046dd34mr6680233ejm.1.1686207140631; Wed, 07 Jun 2023 23:52:20 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2e0b.dip0.t-ipconnect.de. [87.186.46.11]) by smtp.gmail.com with ESMTPSA id r10-20020a170906548a00b009788d99244csm286858ejo.149.2023.06.07.23.52.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jun 2023 23:52:20 -0700 (PDT) Date: Thu, 8 Jun 2023 08:52:18 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] staging: rtl8192e: Use standard api to calculate frequency to channel Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use ieee80211_freq_khz_to_channel() to calculate frequency to channel to omit proprietary code. Signed-off-by: Philipp Hortmann --- Tested this code with separate debug code as this part is usually unused. --- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging= /rtl8192e/rtllib_softmac_wx.c index 78a70e5f1974..6fd2e94d5f8a 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c +++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c @@ -42,15 +42,8 @@ int rtllib_wx_set_freq(struct rtllib_device *ieee, struc= t iw_request_info *a, if (fwrq->e =3D=3D 1) { if ((fwrq->m >=3D (int)2.412e8 && fwrq->m <=3D (int)2.487e8)) { - int f =3D fwrq->m / 100000; - int c =3D 0; - - while ((c < 14) && (f !=3D rtllib_wlan_frequencies[c])) - c++; - - /* hack to fall through */ + fwrq->m =3D ieee80211_freq_khz_to_channel(fwrq->m / 100); fwrq->e =3D 0; - fwrq->m =3D c + 1; } } =20 --=20 2.40.1 From nobody Wed Feb 11 03:42:01 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 31D2DC7EE25 for ; Thu, 8 Jun 2023 06:52:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235046AbjFHGwt (ORCPT ); Thu, 8 Jun 2023 02:52:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234624AbjFHGwo (ORCPT ); Thu, 8 Jun 2023 02:52:44 -0400 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F9F3270F for ; Wed, 7 Jun 2023 23:52:38 -0700 (PDT) Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-51669dd574aso61089a12.0 for ; Wed, 07 Jun 2023 23:52:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686207157; x=1688799157; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=TQKW2CDMPBC9N1g2gyQZv/XRpd7ea6cV/0jZn5MOSfA=; b=eaxc9/pqjJc6kK1znYKJlr/yH7bGWBt1ysV7mIagQF/Hz+gCfmlLOp5OocMMBG/dfD vPW41/fiLorEDUeSh1J2cmBvF6udX1SqsD9QAwG0PKo4QkybO2Q0HzycLMtn+uA2/Jzg mdVzGdIvK1CLrkwUp+bIoTwRgCo+jGYHCMF8bo+G8wTvZTDwzQClDcGmh+2q9DgmryUZ wLcVsJHqMQA4IsBOh5ufv3xwoddzXta0zypK8jp7OlSnLxcM3lzRbZ4JPNxUTlklis9D sbsdxOc18C1NGcCh4eynCpA0D+XC+gqNEQ/bl2dRnTjfjBX8S2X7xWqsVUBGrAEitcg/ ZbIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686207157; x=1688799157; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=TQKW2CDMPBC9N1g2gyQZv/XRpd7ea6cV/0jZn5MOSfA=; b=jYMMbw8aPiQHXJRxustPQBi+jVglaGhMPCMM6jhnFWStEwBKhL4kuIn69xC/TLgkpu nL8cfBvLdLSfmpGlYqg0iTGFtOqbzDmWwIDlURlpYo2+yYVWJdRptzJEy+T1io617fh7 n6jBpJxPRHF5t5t6LbljMS5ErwLmdD8Lo8zFOhigFq6/GYEcaW+wPe+HqKQyCIbiHYIP TH/BHPGx5khIV+F0gDBJhNc0m9C/DHkAiL8pmPZWyKulowwil8n1LruHY781uOe/+/qJ Un1t0v+G1Kzq0EXNzAK11eiEupF6dz1xW5UN1uAophXXEDs9itrM4bZPUduIIBif6eLh LVog== X-Gm-Message-State: AC+VfDyAnRDC1Oj9NgxhEPccQ65YG0deLoBWBLo/1bYkzAeowuWjhLsr AKyHqsdJVX/hUjVJPe3ue0Y= X-Google-Smtp-Source: ACHHUZ7Xiaird4DXuqMeoKDCwKMqKPOplVzbQVoSl1A/rYo8+gtQcAZyOYekDg1rL5Ph9GS3SdWjdQ== X-Received: by 2002:a05:6402:2810:b0:516:a044:b6d8 with SMTP id h16-20020a056402281000b00516a044b6d8mr4205357ede.4.1686207156787; Wed, 07 Jun 2023 23:52:36 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2e0b.dip0.t-ipconnect.de. [87.186.46.11]) by smtp.gmail.com with ESMTPSA id g16-20020aa7d1d0000000b0050bc4600d38sm182287edp.79.2023.06.07.23.52.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jun 2023 23:52:36 -0700 (PDT) Date: Thu, 8 Jun 2023 08:52:34 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] staging: rtl8192e: Use standard api to calculate channel to frequency Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use ieee80211_channel_to_freq_khz() to calculate channel to frequency to omit proprietary code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 6 ++++-- drivers/staging/rtl8192e/rtllib.h | 2 -- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 13 ++----------- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_wx.c index 8b656980ee25..3346c4d72c3e 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c @@ -342,9 +342,11 @@ static int _rtl92e_wx_get_range(struct net_device *dev, =20 for (i =3D 0, val =3D 0; i < 14; i++) { if ((priv->rtllib->active_channel_map)[i + 1]) { + s32 freq_khz; + range->freq[val].i =3D i + 1; - range->freq[val].m =3D rtllib_wlan_frequencies[i] * - 100000; + freq_khz =3D ieee80211_channel_to_freq_khz(i + 1, NL80211_BAND_2GHZ); + range->freq[val].m =3D freq_khz * 100; range->freq[val].e =3D 1; val++; } diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index cdd7fdc5befe..87e9169214f6 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -2049,8 +2049,6 @@ void TsStartAddBaProcess(struct rtllib_device *ieee, void RemovePeerTS(struct rtllib_device *ieee, u8 *Addr); void RemoveAllTS(struct rtllib_device *ieee); =20 -extern const long rtllib_wlan_frequencies[]; - static inline const char *escape_essid(const char *essid, u8 essid_len) { static char escaped[IW_ESSID_MAX_SIZE * 2 + 1]; diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging= /rtl8192e/rtllib_softmac_wx.c index 6fd2e94d5f8a..d6d90e6ba2d3 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c +++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c @@ -15,15 +15,6 @@ =20 #include "rtllib.h" #include "dot11d.h" -/* FIXME: add A freqs */ - -const long rtllib_wlan_frequencies[] =3D { - 2412, 2417, 2422, 2427, - 2432, 2437, 2442, 2447, - 2452, 2457, 2462, 2467, - 2472, 2484 -}; -EXPORT_SYMBOL(rtllib_wlan_frequencies); =20 int rtllib_wx_set_freq(struct rtllib_device *ieee, struct iw_request_info = *a, union iwreq_data *wrqu, char *b) @@ -83,8 +74,8 @@ int rtllib_wx_get_freq(struct rtllib_device *ieee, =20 if (ieee->current_network.channel =3D=3D 0) return -1; - fwrq->m =3D rtllib_wlan_frequencies[ieee->current_network.channel - 1] * - 100000; + fwrq->m =3D ieee80211_channel_to_freq_khz(ieee->current_network.channel, + NL80211_BAND_2GHZ) * 100; fwrq->e =3D 1; return 0; } --=20 2.40.1