From nobody Fri Jun 19 16:53:13 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 CE6B3C433EF for ; Thu, 31 Mar 2022 21:42:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241929AbiCaVoD (ORCPT ); Thu, 31 Mar 2022 17:44:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55240 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235487AbiCaVnz (ORCPT ); Thu, 31 Mar 2022 17:43:55 -0400 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E9AA623193C for ; Thu, 31 Mar 2022 14:42:06 -0700 (PDT) Received: by mail-ej1-x62d.google.com with SMTP id lr4so1939744ejb.11 for ; Thu, 31 Mar 2022 14:42:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4tl+abEk2PyVrmhO7p7RNjL4a5VH5DFSlOT0dssPwTU=; b=VKJB8zPnr2cnSo7lDUdwKt/ugZRsj7PJU+d1bk7ugxrm/pFrVlRwlX1ClE+Nd8nrDh iVz5vHZnPXad9WnpC/iP+r5Y0Dljw/BGW+92gGuTScIZt7ca9H5HGudWFc9OHkvIV1di m2h2di+fwiWHgboGzpOjG0UsVi4N4oHQlWxXOsVQ0JLKCOMFWhfdmDipxQBhiXBboegu kTgz+Rlvd2BtwRxlBCcdQqJCQzC06vMhxAhOKkFX6id4aG/3i45mXyrWaaW4mpLbcvtg iWN/eOszBpY0c/njC90H8g+hKnqLhYyeBoi8EE75H1Ve0vRR9wVMYC4yDdk2nrRGrrpe MX3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4tl+abEk2PyVrmhO7p7RNjL4a5VH5DFSlOT0dssPwTU=; b=yjNmo2EAaj8e3DuzHzA0+BEPSt/TZReIDUT0vceiSeUzztxtFR0lBfiFBSFx/UF4cK jIp3j6pgg9MKK1hi+TVg9VDtmkHRBQjgBxVNsXx3pvDBx8yKCiTAvDeddnYjiqTtXSCG jUYqm0HMbLsjqwEtxo2aK/0xDnLe8pid0W86P356MutAakUoGLQnzlBj4mlCp2QHlTBi jUuUY6X0b65y79kY/+45RTHpnCDQuRqYVtwkaEJhNqg9g0bwF9ZJlFfPiAKKy7Z4sJkb M8w6KCT6tMYNAVokG0Hpsd0510DkRs2zEZB26tbOEEqvzcqzR2/NEVvtO4vP5AlzBWY2 9Ehw== X-Gm-Message-State: AOAM5326Xnnq9EqY8U2Yw9Yo5v2zH8Ffhu1xw9XNK/RtVkninbxtzjBT 6F+2cdFJsu3miYKuS26eAE8= X-Google-Smtp-Source: ABdhPJxD34qnPE8PvQJDXHTCK74/miGsHi2m+v0+QcWvXA0i9oEf8Xv8c9Azy3RhyZHWin1GJlAC0g== X-Received: by 2002:a17:907:8688:b0:6d2:c19:e1a0 with SMTP id qa8-20020a170907868800b006d20c19e1a0mr6376283ejc.249.1648762925545; Thu, 31 Mar 2022 14:42:05 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id dn4-20020a17090794c400b006dbec4f4acbsm244387ejc.6.2022.03.31.14.42.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Mar 2022 14:42:05 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: hdegoede@redhat.com, Larry.Finger@lwfinger.net, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 1/2] staging: rtl8723bs: remove 5 GHz channels from ch_freq_map Date: Thu, 31 Mar 2022 23:41:45 +0200 Message-Id: <20220331214146.15161-2-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220331214146.15161-1-straube.linux@gmail.com> References: <20220331214146.15161-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" According to the Realtek documentation the chips this driver supports are 2.4 GHz only chips. Frequencies for 5 GHz channels can be removed from the ch_freq_map array. Signed-off-by: Michael Straube Reviewed-by: Hans de Goede --- drivers/staging/rtl8723bs/core/rtw_rf.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_rf.c b/drivers/staging/rtl8= 723bs/core/rtw_rf.c index 96eb8ca38003..7e4bf42fd1ac 100644 --- a/drivers/staging/rtl8723bs/core/rtw_rf.c +++ b/drivers/staging/rtl8723bs/core/rtw_rf.c @@ -18,22 +18,6 @@ static struct ch_freq ch_freq_map[] =3D { {1, 2412}, {2, 2417}, {3, 2422}, {4, 2427}, {5, 2432}, {6, 2437}, {7, 2442}, {8, 2447}, {9, 2452}, {10, 2457}, {11, 2462}, {12, 2467}, {13, 2472}, {14, 2484}, - /* UNII */ - {36, 5180}, {40, 5200}, {44, 5220}, {48, 5240}, {52, 5260}, - {56, 5280}, {60, 5300}, {64, 5320}, {149, 5745}, {153, 5765}, - {157, 5785}, {161, 5805}, {165, 5825}, {167, 5835}, {169, 5845}, - {171, 5855}, {173, 5865}, - /* HiperLAN2 */ - {100, 5500}, {104, 5520}, {108, 5540}, {112, 5560}, {116, 5580}, - {120, 5600}, {124, 5620}, {128, 5640}, {132, 5660}, {136, 5680}, - {140, 5700}, - /* Japan MMAC */ - {34, 5170}, {38, 5190}, {42, 5210}, {46, 5230}, - /* Japan */ - {184, 4920}, {188, 4940}, {192, 4960}, {196, 4980}, - {208, 5040},/* Japan, means J08 */ - {212, 5060},/* Japan, means J12 */ - {216, 5080},/* Japan, means J16 */ }; =20 u32 rtw_ch2freq(u32 channel) --=20 2.35.1 From nobody Fri Jun 19 16:53:13 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 430C8C433F5 for ; Thu, 31 Mar 2022 21:42:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241801AbiCaVoI (ORCPT ); Thu, 31 Mar 2022 17:44:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241899AbiCaVn4 (ORCPT ); Thu, 31 Mar 2022 17:43:56 -0400 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AFBEC23193D for ; Thu, 31 Mar 2022 14:42:07 -0700 (PDT) Received: by mail-ed1-x534.google.com with SMTP id g22so840216edz.2 for ; Thu, 31 Mar 2022 14:42:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KXeiIxrYUJtigOz8DNlmN/XSb8iuNB57fGunl8ww6Io=; b=bK9I6HTS+CF6jaF5ezoVOdcXPtA9dyceM3FfAFVbCo8rHiMmKW8dcnUZf8Tmhss+fw pY0N//tjDS87qIlRW5WeNAGpm1mcFbQJhKRWFkC64brym24z62osnRN4qZL+I8Un+qQ6 NSxD/KeL91CoKYjZNNip/XFPkVdk1Thck1LMrjV6nNxi/iEh0cOKbCofDAMC3ueb+rbX 8k7o32yD+8fF4KJeFa8MyV7sPRg2tEVt6lK8SNk+ZnJMMGpKmGj7Qi9HVxiKDL5DFzNv 6pW93FOWI1rVTT4wCLuP5CE1vfpAn2H/qM86R74oay6CZtcP6SDxKG5kg71Ii+xbsA3s 0tOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KXeiIxrYUJtigOz8DNlmN/XSb8iuNB57fGunl8ww6Io=; b=hrugy3k+8FFYucAjIB+LyXJu7Def8+LYAfA0lMUp+fK+PsYn3aS7cVlykskWY5pyJg HK/HClF3RMMUVKA9c2Z9pdWwQ47yASNv53flh+YT8wLGWFslIkFzIZ/UN7MHxWHWfKRl NZuPSukCMJUtmTXV5atSazZ57WdIZZrMw0xMJkiCoyg29AIDG0nd/wwHqqfm6rcrEp6e Nxw5LHC6oQoQoFMA0y0q2WNRLc0YlgCpFzN8SnhiGxdtKwTJFNXOzZaCow+OBJTNX2/+ craOeVALhOOQiIbejMGX4eienrlPjNBtaqOIHU491x4k2EtNqvCbCGJ3nnuD779ya0t4 XzAw== X-Gm-Message-State: AOAM532CdsM484gkpwq05R0SGczN57tqZpHMC+M8T2j6GoJgE68Ln+IV mUx35Tsd456S2rmtTwpk9xs= X-Google-Smtp-Source: ABdhPJwmFVuepYdJZKFdMJNIedJ932o5rNR2hJGBc1RoUI9Z+nk4FnLQl2d5iPQbn5vA8JnGUlJFfw== X-Received: by 2002:a05:6402:d67:b0:419:48b:a762 with SMTP id ec39-20020a0564020d6700b00419048ba762mr18113658edb.291.1648762926313; Thu, 31 Mar 2022 14:42:06 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id dn4-20020a17090794c400b006dbec4f4acbsm244387ejc.6.2022.03.31.14.42.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Mar 2022 14:42:05 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: hdegoede@redhat.com, Larry.Finger@lwfinger.net, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 2/2] staging: rtl8723bs: refactor rtw_ch2freq() Date: Thu, 31 Mar 2022 23:41:46 +0200 Message-Id: <20220331214146.15161-3-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220331214146.15161-1-straube.linux@gmail.com> References: <20220331214146.15161-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Convert the array ch_freq_map to a simple integer array and use the indices as channel numbers. This simplifies the code and avoids looping through the array to get the frequency. To avoid out of bounds array access return a default value for invalid channel values, like the original code did. Signed-off-by: Michael Straube Reviewed-by: Hans de Goede --- drivers/staging/rtl8723bs/core/rtw_rf.c | 40 +++++++++++-------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_rf.c b/drivers/staging/rtl8= 723bs/core/rtw_rf.c index 7e4bf42fd1ac..4f120c894998 100644 --- a/drivers/staging/rtl8723bs/core/rtw_rf.c +++ b/drivers/staging/rtl8723bs/core/rtw_rf.c @@ -8,31 +8,27 @@ #include #include =20 - -struct ch_freq { - u32 channel; - u32 frequency; -}; - -static struct ch_freq ch_freq_map[] =3D { - {1, 2412}, {2, 2417}, {3, 2422}, {4, 2427}, {5, 2432}, - {6, 2437}, {7, 2442}, {8, 2447}, {9, 2452}, {10, 2457}, - {11, 2462}, {12, 2467}, {13, 2472}, {14, 2484}, +static const u32 ch_freq_map[] =3D { + 2412, + 2417, + 2422, + 2427, + 2432, + 2437, + 2442, + 2447, + 2452, + 2457, + 2462, + 2467, + 2472, + 2484 }; =20 u32 rtw_ch2freq(u32 channel) { - u8 i; - u32 freq =3D 0; - - for (i =3D 0; i < ARRAY_SIZE(ch_freq_map); i++) { - if (channel =3D=3D ch_freq_map[i].channel) { - freq =3D ch_freq_map[i].frequency; - break; - } - } - if (i =3D=3D ARRAY_SIZE(ch_freq_map)) - freq =3D 2412; + if (channel =3D=3D 0 || channel > ARRAY_SIZE(ch_freq_map)) + return 2412; =20 - return freq; + return ch_freq_map[channel - 1]; } --=20 2.35.1