From nobody Thu Jun 25 09:36:17 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 CEC34C433EF for ; Tue, 22 Feb 2022 08:29:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229832AbiBVI3Z (ORCPT ); Tue, 22 Feb 2022 03:29:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44096 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229777AbiBVI3X (ORCPT ); Tue, 22 Feb 2022 03:29:23 -0500 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0DE62156973 for ; Tue, 22 Feb 2022 00:28:59 -0800 (PST) Received: by mail-ej1-x62f.google.com with SMTP id bg10so40502617ejb.4 for ; Tue, 22 Feb 2022 00:28:58 -0800 (PST) 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=H8Qt+r4eM4DrLuqCbIAtNlNxohCAgIis75bTjKzOeZE=; b=krOwPs+UMEImQthUATA625wTEwjSUvuTI8wkMRUv1ltR7DdaxHuV1NViX3I9pN+KQA Ysg875Yb2RsOe02fGGFcKdo+Mu4OfkuZWlz+ajY2TYsW6sYyyv0Gm4OUvGhTkK0LKgEU IFoLvvqeFfIa0cjeqDyTg5jsfpd/JY6Dqiszn/X/oT75p2T7LGu4+LXLWVLRIK1JbIVw MftvvXggpw6yYWL7LEcPe2yHfhd91Ud3zjZ8vHaGvB4N5RJMJcVnOeMVM8GOfdxooabB eVGGtr+iaTEq8Jk4YXVmgqvojSOuiESRn1b2Mr4lApexQeSAqV9/Sj7Sm7WIRyBIR5I6 xUlw== 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=H8Qt+r4eM4DrLuqCbIAtNlNxohCAgIis75bTjKzOeZE=; b=IzF+RAHgXIJ8emApyb8/h21VtNXVRBgm+9M0e+1SKMTovsf8NLdIj3iRixRHCCQXIC ghzvc65iZiQqBbSnwsBZDU0KmiZA2FN80HS8fjbNocVBDdDK2d4EQ6fex1IRVOxU9EMJ iBoI8c2/PYzXzmR6oGCTi45hQt6WywFWRaAS0mnpHBDzP+T/whQAil8yOZt386WCOX8q azxRy0/rhbK5FTmr1pJR4XobUbXcOUTK1jtrlb/9k3sUDAuQvy/4FNvdryvq17POsWu3 fF9fo9TVWqb6S49XH8TAj+DJzNmyLvtdBm8CNZ4Ngf2wjgXdxUBJ3RnKPNk8+iZ+dqng h4aQ== X-Gm-Message-State: AOAM533VXJsuX3ycfPACWWyOP+rCSCdUSiWgJkxBvG+w1j9MoU6kQeZu VsL5NvwkX3LxBaEZlipBz6k= X-Google-Smtp-Source: ABdhPJxEojS2irNC3wsBpceWlVvsHXXxGyj4u0/tHBWP6VE9P+OI1+P9j1Be/tZvOLP6UwpZ+Un6xA== X-Received: by 2002:a17:907:b96:b0:6d0:ae6:d153 with SMTP id ey22-20020a1709070b9600b006d00ae6d153mr17770616ejc.699.1645518537636; Tue, 22 Feb 2022 00:28:57 -0800 (PST) Received: from localhost.localdomain (ip5f5abb8f.dynamic.kabel-deutschland.de. [95.90.187.143]) by smtp.gmail.com with ESMTPSA id v12sm9831926edr.8.2022.02.22.00.28.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 00:28:57 -0800 (PST) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH v2 1/3] staging: r8188eu: remove 5 GHz channels from ch_freq_map Date: Tue, 22 Feb 2022 09:28:45 +0100 Message-Id: <20220222082847.6687-2-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220222082847.6687-1-straube.linux@gmail.com> References: <20220222082847.6687-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 --- v2: Changed the commit message. drivers/staging/r8188eu/core/rtw_rf.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_rf.c b/drivers/staging/r8188e= u/core/rtw_rf.c index e704092d31d0..51425971782b 100644 --- a/drivers/staging/r8188eu/core/rtw_rf.c +++ b/drivers/staging/r8188eu/core/rtw_rf.c @@ -17,22 +17,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 static int ch_freq_map_num =3D ARRAY_SIZE(ch_freq_map); --=20 2.35.1 From nobody Thu Jun 25 09:36:17 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 CEC87C433EF for ; Tue, 22 Feb 2022 08:29:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229841AbiBVI32 (ORCPT ); Tue, 22 Feb 2022 03:29:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44178 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229825AbiBVI3Y (ORCPT ); Tue, 22 Feb 2022 03:29:24 -0500 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 B7A6215678A for ; Tue, 22 Feb 2022 00:28:59 -0800 (PST) Received: by mail-ed1-x536.google.com with SMTP id u18so35049481edt.6 for ; Tue, 22 Feb 2022 00:28:59 -0800 (PST) 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=0UMhoqvO6ENLxC1LYsXqT72OwTuutJDRaWt1RySjxzE=; b=frQy8xE5Q48UYglVBLtvg+MTWzX1vQejrd8uuX/0WsUkOqCechJJCFAEKyCSsvgLmN i2hcyjrQW5aerzDaveJCGvbAPZBXV+cfuzcvElznoO1KS0Eg9BD8/VnPSstA1ZJB+cYD O+/om76OPESqB1JcBpChocbdIpEP6oAS+R65b9zfe2wiSQ3B+ElKj/eUNz6rIOEfcpev QdpQIc/B767WGnAo9BJmzp4GvZzF0G64xkch0oyYXV12sr0bNwEiZbnlA8C0Mazq0Flb IIq/k7PPXxtgBMnNuqsIOr/MtU+xJuGFw2Jf6MmD/bSJo9GZMc0ARFteGUzqIvPSJMVX ClWw== 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=0UMhoqvO6ENLxC1LYsXqT72OwTuutJDRaWt1RySjxzE=; b=m23/3Dsml/mQNFC7+LCBRgNqbiEzJ28BJ4zLzTyEFKdWZUCa+3gDRirniymhW+ibVY dqvhq4Bcz/v7Qq2fD5p3KOKL3P24FxpXhYCGtybVxePHIx6rJtfhXAPI7JNIj4KYELuv DVmNLWkdo/rDbu9J9Xf+ffLzyrs83NvqGcJuq06/VCNMDwMHjJKACMcwfwAXPnxkszBX rFg+BfoUB4yPGcT2jw3KQWec4Z7d5C52zxYQJgsvhOL+K3e7fxRFC6X1fa7R+gjkfHMx Mj5vSWyOyke3hyyLeK6MeeTw4IgbArlwrmRQETBX9gyDVE8BFe9xkZfYgPVImdbmpysl DYSA== X-Gm-Message-State: AOAM531kog2jm31uba6drTIGpcOvVQJ4GUV4KD7Xbe6q08i+R4j0lYmA mFxiUxUlfjTJfYpQTWWRLqM= X-Google-Smtp-Source: ABdhPJz2e1oWv0FkjbWR3Z//1hhYeL5xwBnQ9MW/NyOEOt+kqyCib93ouedmgh+gvwlQNYxTn23NJA== X-Received: by 2002:aa7:cb8b:0:b0:410:9aaf:2974 with SMTP id r11-20020aa7cb8b000000b004109aaf2974mr24726526edt.173.1645518538404; Tue, 22 Feb 2022 00:28:58 -0800 (PST) Received: from localhost.localdomain (ip5f5abb8f.dynamic.kabel-deutschland.de. [95.90.187.143]) by smtp.gmail.com with ESMTPSA id v12sm9831926edr.8.2022.02.22.00.28.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 00:28:58 -0800 (PST) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH v2 2/3] staging: r8188eu: refactor rtw_ch2freq() Date: Tue, 22 Feb 2022 09:28:46 +0100 Message-Id: <20220222082847.6687-3-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220222082847.6687-1-straube.linux@gmail.com> References: <20220222082847.6687-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 --- v2: Added a check to avoid out of bounds array access. drivers/staging/r8188eu/core/rtw_rf.c | 41 ++++++++++++--------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_rf.c b/drivers/staging/r8188e= u/core/rtw_rf.c index 51425971782b..68178699a0c6 100644 --- a/drivers/staging/r8188eu/core/rtw_rf.c +++ b/drivers/staging/r8188eu/core/rtw_rf.c @@ -8,32 +8,27 @@ #include "../include/recv_osdep.h" #include "../include/xmit_osdep.h" =20 -struct ch_freq { - u32 channel; - u32 frequency; +static const u32 ch_freq_map[] =3D { + 2412, + 2417, + 2422, + 2427, + 2432, + 2437, + 2442, + 2447, + 2452, + 2457, + 2462, + 2467, + 2472, + 2484 }; =20 -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 int ch_freq_map_num =3D ARRAY_SIZE(ch_freq_map); - u32 rtw_ch2freq(u32 channel) { - u8 i; - u32 freq =3D 0; - - for (i =3D 0; i < ch_freq_map_num; i++) { - if (channel =3D=3D ch_freq_map[i].channel) { - freq =3D ch_freq_map[i].frequency; - break; - } - } - if (i =3D=3D ch_freq_map_num) - 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 From nobody Thu Jun 25 09:36:17 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 58B23C433EF for ; Tue, 22 Feb 2022 08:29:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229862AbiBVI3a (ORCPT ); Tue, 22 Feb 2022 03:29:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44278 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229831AbiBVI3Z (ORCPT ); Tue, 22 Feb 2022 03:29:25 -0500 Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A6F3C157226 for ; Tue, 22 Feb 2022 00:29:00 -0800 (PST) Received: by mail-ej1-x636.google.com with SMTP id a23so40363487eju.3 for ; Tue, 22 Feb 2022 00:29:00 -0800 (PST) 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=J4YfQybsK+XfBBKMof2I6wzbyQxle5AmeBoOukDBvsE=; b=PC9HeviVJ9bQZnx0cbe2TiMsc5Rrn4zqRnAIQngqMUsOaJ5r13jAxh6bmWwwk5/61T 4qA9VlvySrUgbUttIEmpCJG3op/YHzagejyfu51VDgsZbEOq93q0gsu0M+NnYa0qvkaX 53CnWroqu7cy9J6MyqgKkcrEHZdAL5KvXqE5QhP7hcJvshx+cMjfEa0FZt5nx8dScJ/Q 2H5R0yLwL2abEMhsmyXMEgngaNtL3R2pUCy75Py6nksvUEQDcXedlHkXTd2sgv1/Tfsd RpWYmxpl1YXzYQZw+T7Fqm/p5lKyx1kbVgF65vos+xVZFv3Rr99aGYHTS7z3jc0iBQIT xqoQ== 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=J4YfQybsK+XfBBKMof2I6wzbyQxle5AmeBoOukDBvsE=; b=dMsTq6ZsAOYxo0Kc8hAp2DQHLSRglKqVJOHj3uRyfLry+DO0SrHE5VqjTZ2N4PUEe+ qjDN5hq6W0y1RjQ91RBH+M1nyrkh6pZZIOFIqVZ7sQCcGnuKahdVbrf+4D47L2TYusD4 TR3NyfpVNc/xTrFs7fBFu0M4qYqaGqiRm8KiYt9yWMHyKMoc68UB9Z/Hfw3CFT8EXpR1 LH03DIJBkC99tLbVjTUV+3iFLt5SjWtK6WTnxMKr2QVvCmeyP/XL2UtvMOiSRCcgSwLb kGEYf/uLVWl95Dq0UnjpWLXo6mw4pllv2+nlpuJnOvIe5oJSfkyTik0u97vcSUw0IxzU N/EQ== X-Gm-Message-State: AOAM531LwuFztmn/QRXIVVnt+NOfegXgz3oIQEks4PK1oE8RusiwX14J lZyiYUUXck9eTbfQ4J+K8o8= X-Google-Smtp-Source: ABdhPJxoHl1uKaghZMUCYpBJ/nzr1+Srdcw1R2PqegQppU8mvJhAqbR24+PJ+ni/HgCKkTanG66ILQ== X-Received: by 2002:a17:907:366:b0:6ba:fff6:4fc7 with SMTP id rs6-20020a170907036600b006bafff64fc7mr18310266ejb.756.1645518539303; Tue, 22 Feb 2022 00:28:59 -0800 (PST) Received: from localhost.localdomain (ip5f5abb8f.dynamic.kabel-deutschland.de. [95.90.187.143]) by smtp.gmail.com with ESMTPSA id v12sm9831926edr.8.2022.02.22.00.28.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 00:28:58 -0800 (PST) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH v2 3/3] staging: r8188eu: clean up rtw_rf.c Date: Tue, 22 Feb 2022 09:28:47 +0100 Message-Id: <20220222082847.6687-4-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220222082847.6687-1-straube.linux@gmail.com> References: <20220222082847.6687-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" Remove unnecessary includes and the unused define _RTW_RF_C_ from rtw_rf.c. Signed-off-by: Michael Straube --- v2: No changes. drivers/staging/r8188eu/core/rtw_rf.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_rf.c b/drivers/staging/r8188e= u/core/rtw_rf.c index 68178699a0c6..2d2f0fc4c942 100644 --- a/drivers/staging/r8188eu/core/rtw_rf.c +++ b/drivers/staging/r8188eu/core/rtw_rf.c @@ -1,12 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /* Copyright(c) 2007 - 2011 Realtek Corporation. */ =20 -#define _RTW_RF_C_ - -#include "../include/osdep_service.h" #include "../include/drv_types.h" -#include "../include/recv_osdep.h" -#include "../include/xmit_osdep.h" =20 static const u32 ch_freq_map[] =3D { 2412, --=20 2.35.1