From nobody Thu Dec 18 09:39:17 2025 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 2F15EEE14C3 for ; Sat, 9 Sep 2023 18:19:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238419AbjIISTj (ORCPT ); Sat, 9 Sep 2023 14:19:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231376AbjIISTi (ORCPT ); Sat, 9 Sep 2023 14:19:38 -0400 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C54E1B1 for ; Sat, 9 Sep 2023 11:19:33 -0700 (PDT) Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-401ce65dfc4so9127425e9.0 for ; Sat, 09 Sep 2023 11:19:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694283572; x=1694888372; darn=vger.kernel.org; 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=ssVWE9PyVo0MJDIoiWo0h0qTjLlpWHSLjGBywkF+JnM=; b=lRyus6n9Kmg4hMdhYB4x9rUuwcwMXcIm4DMa/lwEr+SkR2h0s+AKd07xUB0gfEpCiG 70KaXcL6hLAYxigy/afLfipFCp85cYFHn5Y9c93AVAsJUZHvmEfgTNLoK23+CoeBg7FM oegSVOceeiv5DjQd9vP36uI8M2HbRroH4NbTo8A+X8+O0ZIX3dqAgAL9rUMBYCIGC0gT W0eBa2yccKwtCgJMdJzHTDcuLyR++bohf8kZLuIqhqd/R3KeBZbREnwT9zweUBWYm6mR D6EVxn4Qrg5W5gymU1VL3XG0LoceWD2+6SdSxnSpoP4KgPLYZ0eW187JxKJvWW3gNEmV miKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694283572; x=1694888372; 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=ssVWE9PyVo0MJDIoiWo0h0qTjLlpWHSLjGBywkF+JnM=; b=WXuPfHUXLF7GpcnXFanh6+V7twSwQKTVW6dbGgKRn/AqNsUhpKCOm9KAfwENvZZfMA ptzJbOSm+/q6JLbojqY0k50XHFiaw1nkEkHbYuZBAo1nvvsgtlQLdPTRTrq7OhnDSdOB HuaFTYJPogO2uBM7A+t+OFKtrLXQIB1wQgrHHJ8tGKvE6w1+UJTnOeHCcbxJCuxQlAcx uVRhV/SjRo1Yd4duyPlain3AJXflAXfCxgXiuxIdWDEHGX+L4DcALOfbFRmCwPr+4wOb PFz3n+gW27skj11iAK3/cBtG8mWdccTsEHEiUpVi6imaBX73t9k67CpvMKijQ8y6W6/q NOyw== X-Gm-Message-State: AOJu0Yws1oV9l+QeGij0/rnVLp9ZJR2nSFKXmKSS47Kn/OTReVG0ATxj vGpWgKMdyy/ge78RIe+d3I7F4q8+jkpchg== X-Google-Smtp-Source: AGHT+IEhuPEY0HZVsNBEFRYiSMZ0IGtHD9bjAZpJ1rbS5hq35Mso0ccW4ZxJ0leRhLTYra4AhoiHIg== X-Received: by 2002:a05:600c:3114:b0:3fe:d46a:ef4b with SMTP id g20-20020a05600c311400b003fed46aef4bmr5151459wmo.1.1694283571697; Sat, 09 Sep 2023 11:19:31 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id a2-20020a05600c224200b003fed8e12d62sm5242873wmm.27.2023.09.09.11.19.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Sep 2023 11:19:31 -0700 (PDT) Date: Sat, 9 Sep 2023 20:19:29 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 1/8] staging: rtl8192e: Remove useless equation in debug output Message-ID: <34330df02f386b9e3b69baf582cb2933635867c4.1694282907.git.philipp.g.hortmann@gmail.com> 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" When "switch (WLAN_FC_GET_STYPE(le16_to_cpu(header->frame_ctl)))" results in "case RTLLIB_STYPE_BEACON:" there is no need to calculate this again inside "case" and when a frame is a beacon there is no need to print the frame identifier again as it is explicit. Same for PROBE RESPONSE and PROBE REQUEST. Remove dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtllib_rx.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192= e/rtllib_rx.c index 0e695b144b36..9f944eefa41e 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -2652,8 +2652,7 @@ static void rtllib_rx_mgt(struct rtllib_device *ieee, =20 switch (WLAN_FC_GET_STYPE(le16_to_cpu(header->frame_ctl))) { case RTLLIB_STYPE_BEACON: - netdev_dbg(ieee->dev, "received BEACON (%d)\n", - WLAN_FC_GET_STYPE(le16_to_cpu(header->frame_ctl))); + netdev_dbg(ieee->dev, "received BEACON\n"); rtllib_process_probe_response( ieee, (struct rtllib_probe_response *)header, stats); @@ -2666,14 +2665,12 @@ static void rtllib_rx_mgt(struct rtllib_device *iee= e, break; =20 case RTLLIB_STYPE_PROBE_RESP: - netdev_dbg(ieee->dev, "received PROBE RESPONSE (%d)\n", - WLAN_FC_GET_STYPE(le16_to_cpu(header->frame_ctl))); + netdev_dbg(ieee->dev, "received PROBE RESPONSE\n"); rtllib_process_probe_response(ieee, (struct rtllib_probe_response *)header, stats); break; case RTLLIB_STYPE_PROBE_REQ: - netdev_dbg(ieee->dev, "received PROBE REQUEST (%d)\n", - WLAN_FC_GET_STYPE(le16_to_cpu(header->frame_ctl))); + netdev_dbg(ieee->dev, "received PROBE REQUEST\n"); if ((ieee->softmac_features & IEEE_SOFTMAC_PROBERS) && (ieee->iw_mode =3D=3D IW_MODE_ADHOC && ieee->link_state =3D=3D MAC80211_LINKED)) --=20 2.41.0 From nobody Thu Dec 18 09:39:17 2025 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 1F024EE14A9 for ; Sat, 9 Sep 2023 18:19:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231376AbjIISTo (ORCPT ); Sat, 9 Sep 2023 14:19:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238467AbjIISTn (ORCPT ); Sat, 9 Sep 2023 14:19:43 -0400 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F6DDCD3 for ; Sat, 9 Sep 2023 11:19:39 -0700 (PDT) Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-3175e1bb38cso523344f8f.1 for ; Sat, 09 Sep 2023 11:19:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694283577; x=1694888377; darn=vger.kernel.org; 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=1aLXZJ8e8a6ZIeBJrLxOGJeFVq96U2uVqqm6oo+s6Dg=; b=rSvQnXf4FcWGuKNApGjI/rhgcztlhtmfvxKX2Fjj0LuhwlQJ+Kjlptw9lITOvfjjkE nCspQraifMwfpbmAeJ6l9Srfxyj7ns6pQd+osY/tZ4EPzEVB3CF728sRI3kgCrnGOVpx oFJqDrzMytdU8OJL4dg51IthIXQ3wiVsYM1LaHzMLy9Vh7U+V7yZQ8iBKI25rlq5aJCV hh5Ln1PJu0y/axVqOHJOoBR3T7pAPQXoFo8vCrQBjGgBJodqsS0ZS6Rq8Gw091rI0xEd Mjp+YtPVPJpkvC8goP1nSq2iCCg7xpCaRqIUBw4g+6FxuCLSeNHupxSBYSa2GUQBbfyO 1odA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694283577; x=1694888377; 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=1aLXZJ8e8a6ZIeBJrLxOGJeFVq96U2uVqqm6oo+s6Dg=; b=OJ3e7gjmCXpOVKYkVfMMzAvhNKXbbdfuqv+bKkAJUU19ImYPIGRA0WWvVq7hzCaKbp BK2z6HqrfVersHjoc8Vk/9eaKOTY/v5emtDisbVu/opasIVkMkrJqOkHvXkdnd6/s6Ia ijFXaDEh3h3GbLcEr8KRX8LpDowKfnzi8HRuSCxlpV4v0QNOvmkefaiI2FyNqIHXDfKF 42rx9GGQXHtE3RB7z+V0Zgkwm3xxXxqqTB/K+D/P2M3k/BVPmNQQ1wNBo4PewYE0hJNd AaWLscaFmzulEgx1UGdVbcRmc7CQHUySmEJRsWTynWA2N/8zCAKhBKnsPnnhVLDExTJN Fkhg== X-Gm-Message-State: AOJu0Yxscpl+mP0981yn2EayWZcd1bcmWa5fxcL0cQ46KAB2G+5l+FHN 9XzHfuZ9l7QUU1ex4GCsbCP3BMIDjozniA== X-Google-Smtp-Source: AGHT+IE0omFKM3JitdIp9lk4WPJ3b6Oj2Sakmb1uePpPNXbtLnIIY9lH+XCZgxIetNGRtwvsuEKi0Q== X-Received: by 2002:adf:fec2:0:b0:31a:e21f:37ef with SMTP id q2-20020adffec2000000b0031ae21f37efmr4366455wrs.3.1694283577276; Sat, 09 Sep 2023 11:19:37 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id g9-20020adff409000000b00315af025098sm5408533wro.46.2023.09.09.11.19.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Sep 2023 11:19:37 -0700 (PDT) Date: Sat, 9 Sep 2023 20:19:35 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 2/8] staging: rtl8192e: Use standard ieee80211 function in rtllib_rx_mgt() Message-ID: <9cb9ffc25d558af2a0c6e1abb6ae92521ba7ab89.1694282907.git.philipp.g.hortmann@gmail.com> 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" Replace WLAN_FC_GET_STYPE(le16_to_cpu(header->frame_ctl)) and comparison with standard function to avoid proprietary code and to increase readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtllib_rx.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192= e/rtllib_rx.c index 9f944eefa41e..108238aa61d9 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -2644,14 +2644,11 @@ static void rtllib_rx_mgt(struct rtllib_device *iee= e, { struct rtllib_hdr_4addr *header =3D (struct rtllib_hdr_4addr *)skb->data; =20 - if ((WLAN_FC_GET_STYPE(le16_to_cpu(header->frame_ctl)) !=3D - RTLLIB_STYPE_PROBE_RESP) && - (WLAN_FC_GET_STYPE(le16_to_cpu(header->frame_ctl)) !=3D - RTLLIB_STYPE_BEACON)) + if (!ieee80211_is_probe_resp(header->frame_ctl) && + (!ieee80211_is_beacon(header->frame_ctl))) ieee->last_rx_ps_time =3D jiffies; =20 - switch (WLAN_FC_GET_STYPE(le16_to_cpu(header->frame_ctl))) { - case RTLLIB_STYPE_BEACON: + if (ieee80211_is_beacon(header->frame_ctl)) { netdev_dbg(ieee->dev, "received BEACON\n"); rtllib_process_probe_response( ieee, (struct rtllib_probe_response *)header, @@ -2661,20 +2658,15 @@ static void rtllib_rx_mgt(struct rtllib_device *iee= e, ieee->iw_mode =3D=3D IW_MODE_INFRA && ieee->link_state =3D=3D MAC80211_LINKED)) schedule_work(&ieee->ps_task); - - break; - - case RTLLIB_STYPE_PROBE_RESP: + } else if (ieee80211_is_probe_resp(header->frame_ctl)) { netdev_dbg(ieee->dev, "received PROBE RESPONSE\n"); rtllib_process_probe_response(ieee, (struct rtllib_probe_response *)header, stats); - break; - case RTLLIB_STYPE_PROBE_REQ: + } else if (ieee80211_is_probe_req(header->frame_ctl)) { netdev_dbg(ieee->dev, "received PROBE REQUEST\n"); if ((ieee->softmac_features & IEEE_SOFTMAC_PROBERS) && (ieee->iw_mode =3D=3D IW_MODE_ADHOC && ieee->link_state =3D=3D MAC80211_LINKED)) rtllib_rx_probe_rq(ieee, skb); - break; } } --=20 2.41.0 From nobody Thu Dec 18 09:39:17 2025 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 B3F36EE14AA for ; Sat, 9 Sep 2023 18:19:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238730AbjIISTz (ORCPT ); Sat, 9 Sep 2023 14:19:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38072 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238467AbjIISTy (ORCPT ); Sat, 9 Sep 2023 14:19:54 -0400 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 703D9CED for ; Sat, 9 Sep 2023 11:19:44 -0700 (PDT) Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-401ef656465so9072965e9.1 for ; Sat, 09 Sep 2023 11:19:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694283583; x=1694888383; darn=vger.kernel.org; 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=IOE6XlBntSncTLlCWMl5brTZ/7LxZLVyWM/OgQDv3Gg=; b=eLU2HNIvA9JAyRBFDgbP4kb12qOJF6dg+Qh9sCnqUNDa86uxpnap+khL8CkePAvAJA FZj7n92v0Q98NVCT92h3eQTP+Oy5YUIELZLRes/Bkvh09Htc5NSLhA4IE2Mn501bYWMh 4xn9Q28FZwz+PKTWs+kpMZ0nS5/mpnqAqn/fuaa+Ajo1PpG5ucMPI0ayJ7hQgzqHWp1s kTxD0LWiAuPxJ2vJVWqkDwcmc2MyOwXAVP+ZOVSY/S7Jt2HtJwISEf9cp9e2/MGiyAl1 n3AJBhkuOQiP8Y+15SXLhXba9hvIr/DqN0S/tKiUp92fE/g2gc0pxFM4Z8yt1uWd+aC2 LniA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694283583; x=1694888383; 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=IOE6XlBntSncTLlCWMl5brTZ/7LxZLVyWM/OgQDv3Gg=; b=Z/uljwDEIKqQhIXmIH6S6nn3+9c2fdQJU/kV21PZkeIKMdElQcn2EwuElfDV9JwfTt vjqXGJ79RatU+QUVJu98IXoUbGMjbbtuEogbCRNzSn4bmxnx1j+L9iDco1srAWgi7RKO iPNYoO28+b9zurxEmP1KMG+CnhsrhyKKzhd12PmykqGESLh1aVmTMqOaDc7YwrBo0emj HmMUnLUGJCArRe3MHRCkgzKYsw+9L8TUfFa8jZdm+oCAjPrk0ysk85vDvBTO07aFZi7O XaZPPmDqm4a83DFcs/eo5aeIUBYHHDOhgRFnS1Rz/6ZwzCv1EXolRw35mz0gHF7janVF fVSA== X-Gm-Message-State: AOJu0YxPTnXoXXs4A7suMVHpIJiMI25wbQINtkutwZVNgxvz87bp9xmT +dyq2gVu9Yx8qkl4nPOVGZ8= X-Google-Smtp-Source: AGHT+IFTaKn85G8pHUiSw+ZLVsc2X6tVt+VxCw1j0vbNFp+QI4MF4bXya63MafT83wdsJ3tc09V5yQ== X-Received: by 2002:a05:600c:3b03:b0:401:7d3b:cc84 with SMTP id m3-20020a05600c3b0300b004017d3bcc84mr5186831wms.0.1694283582616; Sat, 09 Sep 2023 11:19:42 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id n13-20020a5d484d000000b0031f3b04e7cdsm5372378wrs.109.2023.09.09.11.19.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Sep 2023 11:19:42 -0700 (PDT) Date: Sat, 9 Sep 2023 20:19:40 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 3/8] staging: rtl8192e: Use standard function in rtllib_process_probe_response() 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" Replace proprietary is_beacon() with ieee80211_is_beacon() and proprietary "WLAN_FC_GET_STYPE(frame_ctl) =3D=3D RTLLIB_STYPE_PROBE_RESP" with standard function to increase readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtllib_rx.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192= e/rtllib_rx.c index 108238aa61d9..89c8d66765fe 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -2448,11 +2448,6 @@ static inline void update_network(struct rtllib_devi= ce *ieee, dst->BssCcxVerNumber =3D src->BssCcxVerNumber; } =20 -static inline int is_beacon(u16 fc) -{ - return (WLAN_FC_GET_STYPE(fc) =3D=3D RTLLIB_STYPE_BEACON); -} - static int IsPassiveChannel(struct rtllib_device *rtllib, u8 channel) { if (channel > MAX_CHANNEL_NUMBER) { @@ -2491,7 +2486,7 @@ static inline void rtllib_process_probe_response( short renew; struct rtllib_network *network =3D kzalloc(sizeof(struct rtllib_network), GFP_ATOMIC); - u16 frame_ctl =3D le16_to_cpu(beacon->header.frame_ctl); + __le16 frame_ctl =3D beacon->header.frame_ctl; =20 if (!network) return; @@ -2521,14 +2516,14 @@ static inline void rtllib_process_probe_response( netdev_dbg(ieee->dev, "Dropped '%s' ( %pM) via %s.\n", escape_essid(info_element->data, info_element->len), beacon->header.addr3, - is_beacon(frame_ctl) ? "BEACON" : "PROBE RESPONSE"); + ieee80211_is_beacon(frame_ctl) ? "BEACON" : "PROBE RESPONSE"); goto free_network; } =20 if (!rtllib_legal_channel(ieee, network->channel)) goto free_network; =20 - if (WLAN_FC_GET_STYPE(frame_ctl) =3D=3D RTLLIB_STYPE_PROBE_RESP) { + if (ieee80211_is_probe_resp(frame_ctl)) { if (IsPassiveChannel(ieee, network->channel)) { netdev_info(ieee->dev, "GetScanInfo(): For Global Domain, filter probe response at channe= l(%d).\n", @@ -2561,7 +2556,7 @@ static inline void rtllib_process_probe_response( else ieee->current_network.buseprotection =3D false; } - if (is_beacon(frame_ctl)) { + if (ieee80211_is_beacon(frame_ctl)) { if (ieee->link_state >=3D MAC80211_LINKED) ieee->link_detect_info.NumRecvBcnInPeriod++; } @@ -2597,7 +2592,7 @@ static inline void rtllib_process_probe_response( netdev_dbg(ieee->dev, "Adding '%s' ( %pM) via %s.\n", escape_essid(network->ssid, network->ssid_len), network->bssid, - is_beacon(frame_ctl) ? "BEACON" : "PROBE RESPONSE"); + ieee80211_is_beacon(frame_ctl) ? "BEACON" : "PROBE RESPONSE"); =20 memcpy(target, network, sizeof(*target)); list_add_tail(&target->list, &ieee->network_list); @@ -2607,7 +2602,7 @@ static inline void rtllib_process_probe_response( netdev_dbg(ieee->dev, "Updating '%s' ( %pM) via %s.\n", escape_essid(target->ssid, target->ssid_len), target->bssid, - is_beacon(frame_ctl) ? "BEACON" : "PROBE RESPONSE"); + ieee80211_is_beacon(frame_ctl) ? "BEACON" : "PROBE RESPONSE"); =20 /* we have an entry and we are going to update it. But this * entry may be already expired. In this case we do the same @@ -2628,7 +2623,7 @@ static inline void rtllib_process_probe_response( } =20 spin_unlock_irqrestore(&ieee->lock, flags); - if (is_beacon(frame_ctl) && + if (ieee80211_is_beacon(frame_ctl) && is_same_network(&ieee->current_network, network, (network->ssid_len ? 1 : 0)) && (ieee->link_state =3D=3D MAC80211_LINKED)) { --=20 2.41.0 From nobody Thu Dec 18 09:39:17 2025 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 743F8EE14AA for ; Sat, 9 Sep 2023 18:20:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239023AbjIISUZ (ORCPT ); Sat, 9 Sep 2023 14:20:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239009AbjIISUU (ORCPT ); Sat, 9 Sep 2023 14:20:20 -0400 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8D6F210F3 for ; Sat, 9 Sep 2023 11:19:51 -0700 (PDT) Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-3fe4f3b5f25so8896865e9.0 for ; Sat, 09 Sep 2023 11:19:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694283590; x=1694888390; darn=vger.kernel.org; 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=GpwmshN/SnkxoMv0hgadPL0UXh7rR+Fy3DtPmnciQb0=; b=VPa5MSphjh++SdAtit7iu3Awzeqd/iCCJHCeF0aanPN2vJJ571CXfF2YjBgKtJrZIj uvMaZwguc5dE3WO6hptDKJOo/rpXsrmNFRUbkTSgdwQnEmYLYb+VssNumtfOIdGUFSTN gpqjDAkVZ+V7YzdZFp6z54zya8cYM5vm3C+8GNzdLVLXOoVH9nDhiH3GvSxZ62fJRufs rYK7GQJWZ/5Bq0PPCLBlUlmJuctEPMbnHyuMrKNjAYfhmNaTn96CBzPko5ylbmYtsLNa lBUBTtHMWzA1VjftzDpjHA2fA8KQmgi+x13nOaVa2uQP968cn2t+1AVKvhXmQI2oSwlW WF0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694283590; x=1694888390; 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=GpwmshN/SnkxoMv0hgadPL0UXh7rR+Fy3DtPmnciQb0=; b=YDSw6kIcEWHMd7HPVmH+dprPxRXrTNFKeRxaQ8nxA38UF3nSpZ/7Nu5eoxaVdUU9Ye B2qk35+OimQfncBBMPq99wzND2gC12WlDGNo1hQNCw0ZCfq0uUQ1Z6RucmssgEP+k6Er 4AHUPB6NgvsnDLcTitP12b7EhlVabr2IvslwIG+vDWquqdtMPJ5jp2rjfrt4OuAjq6bt Qngo7VFr9Z0zE/fcRnvXdRlO2N3JFcU/g5xo5GaRWlIfMvMX8mf7zt1WpQBypCG9w/bN BJiVIMqSd2CctnPJ+O/ORx6qFFphfr4x6lDXZmE8KagaN/UK/RVao6fYOktagE3CPLsO U9ug== X-Gm-Message-State: AOJu0YzJvCivLSZ8jGns5B4jsFJ8OI8kyYE85rDj6WoDuJFhu7jZCHty LdYMtgWhXMlN2BKXKTjZ2Fk= X-Google-Smtp-Source: AGHT+IHLt3smwCNceCgJThJzA35FlMq7WPqfvXc8OO+RfHKvxUVXmcgCPYlMvVJBJCWColdkWAkbzQ== X-Received: by 2002:a05:600c:1d0a:b0:401:c6a2:3cd5 with SMTP id l10-20020a05600c1d0a00b00401c6a23cd5mr4916064wms.2.1694283589687; Sat, 09 Sep 2023 11:19:49 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id l10-20020a1c790a000000b003fed70fb09dsm5232607wme.26.2023.09.09.11.19.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Sep 2023 11:19:49 -0700 (PDT) Date: Sat, 9 Sep 2023 20:19:47 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 4/8] staging: rtl8192e: Use standard function in rtllib_rx_check_duplicate() 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 standard function ieee80211_is_beacon() to avoid proprietary code and to increase readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtllib_rx.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192= e/rtllib_rx.c index 89c8d66765fe..80eee43ee444 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -904,11 +904,8 @@ static int rtllib_rx_check_duplicate(struct rtllib_dev= ice *ieee, { struct rtllib_hdr_4addr *hdr =3D (struct rtllib_hdr_4addr *)skb->data; u16 fc, sc; - u8 frag, type, stype; + u8 frag; =20 - fc =3D le16_to_cpu(hdr->frame_ctl); - type =3D WLAN_FC_GET_TYPE(fc); - stype =3D WLAN_FC_GET_STYPE(fc); sc =3D le16_to_cpu(hdr->seq_ctl); frag =3D WLAN_GET_SEQ_FRAG(sc); =20 @@ -916,8 +913,7 @@ static int rtllib_rx_check_duplicate(struct rtllib_devi= ce *ieee, !ieee->current_network.qos_data.active || !IsDataFrame(skb->data) || IsLegacyDataFrame(skb->data)) { - if (!((type =3D=3D RTLLIB_FTYPE_MGMT) && - (stype =3D=3D RTLLIB_STYPE_BEACON))) { + if (!ieee80211_is_beacon(hdr->frame_ctl)) { if (is_duplicate_packet(ieee, hdr)) return -1; } --=20 2.41.0 From nobody Thu Dec 18 09:39:17 2025 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 F39B8EE14A9 for ; Sat, 9 Sep 2023 18:20:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239230AbjIISUr (ORCPT ); Sat, 9 Sep 2023 14:20:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49152 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239043AbjIISUq (ORCPT ); Sat, 9 Sep 2023 14:20:46 -0400 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C8644E57 for ; Sat, 9 Sep 2023 11:20:07 -0700 (PDT) Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-401314e7838so9061125e9.1 for ; Sat, 09 Sep 2023 11:20:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694283604; x=1694888404; darn=vger.kernel.org; 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=t0GJntv/tr8/Gm4ETuKdQjTd3AzrBQjbaRNLIIDonBY=; b=BJjDzbKNb5SIDFItOlBKEvjY6ltrFHAw9pexxkx/cMFeCYlFHX6zxfdUG5nx6nfAqH c3ErARLMSeILcIHdyAZLsKZKpd+Z4skk/zZUXSgwwA8YQ8LjVv9LlRKaWnwF553qw7/O C0pSLW8rdqugrPI7f3te4vRSvFrAl86ve8fakVevqySq2fDaTgPqOCsamLiimtczxanS DMf/nUFiijbSyJKd7xG8JCOd+myq2poeK8ubHr4CnuhBvFoHbed38KoqZFzmHRslnSxP drvbfg3fivtAzjurh1aOYgR3+dhf81d1u+Qi85eiCZnjQ7db8UcK+H5P7tNvES53W6LS AA4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694283604; x=1694888404; 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=t0GJntv/tr8/Gm4ETuKdQjTd3AzrBQjbaRNLIIDonBY=; b=qlwGi+T2FMUohD8I1ZZ5FuFStV+4zLEvo5tluglUUWjpgnK0imAGPqCKwjmBRUEq+4 Z8/SKytpjdK86o4tvtC+zvcjlWNhWqX5ywXGfitEZIcBVY4l7wKrAraFcTyeYir9jXba LBNvyzsWadFkSOKJTCIcp7rpnAFssNfH7bFkT7W5KaXUzOTfZnXriOP9l/1+Rhou/hx5 jSKIJ0++rFw8JMKNchtC+Y4C1sNwBN30vZQ1WHsAXlxo6UKazIrg0OV2feMQJUHH6+dE JUdfZ3xyJZYA7DELnsA3EY/bUhUEZu4ti9fX+oKOzrL6A+ImtpxgvR3z0GsQ7MIejfu/ QTJg== X-Gm-Message-State: AOJu0YzfiJZAHBXbt23ubyF46hU8Rv7aD21iTJwRIqfNDsqeyuSxUFXs VL87/fGmlPiX69sZFNC+2TE= X-Google-Smtp-Source: AGHT+IGVIBnE+056PTRWKmggLco2irpXki5yrAdaFey/hKmlCTT5C6E0jdbEVHOrytZ5i6374DkO0A== X-Received: by 2002:a5d:654d:0:b0:317:3d36:b2c1 with SMTP id z13-20020a5d654d000000b003173d36b2c1mr4165167wrv.7.1694283604090; Sat, 09 Sep 2023 11:20:04 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id i9-20020a5d5589000000b003141e629cb6sm5330113wrv.101.2023.09.09.11.20.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Sep 2023 11:20:03 -0700 (PDT) Date: Sat, 9 Sep 2023 20:20:02 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 5/8] staging: rtl8192e: Use standard function in softmac_mgmt_xmit() 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 standard function ieee80211_is_beacon() to avoid proprietary code to identify beacon and to increase readability in softmac_mgmt_xmit() and _rtl92e_translate_rx_signal_stats() Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +- drivers/staging/rtl8192e/rtllib.h | 1 - drivers/staging/rtl8192e/rtllib_softmac.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index 58e90b7772ef..8adf53174239 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -1584,7 +1584,7 @@ static void _rtl92e_translate_rx_signal_stats(struct = net_device *dev, (!pstats->bHwError) && (!pstats->bCRC) && (!pstats->bICV)); bpacket_toself =3D bpacket_match_bssid && /* check this */ ether_addr_equal(praddr, priv->rtllib->dev->dev_addr); - if (WLAN_FC_GET_FRAMETYPE(fc) =3D=3D RTLLIB_STYPE_BEACON) + if (ieee80211_is_beacon(hdr->frame_ctl)) bPacketBeacon =3D true; _rtl92e_process_phyinfo(priv, tmp_buf, &previous_stats, pstats); _rtl92e_query_rxphystatus(priv, pstats, pdesc, pdrvinfo, diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index 95c9f6679d71..7dfb93f0590c 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -459,7 +459,6 @@ enum _REG_PREAMBLE_MODE { #define WLAN_FC_GET_STYPE(fc) ((fc) & RTLLIB_FCTL_STYPE) #define WLAN_FC_MORE_DATA(fc) ((fc) & RTLLIB_FCTL_MOREDATA) =20 -#define WLAN_FC_GET_FRAMETYPE(fc) ((fc) & RTLLIB_FCTL_FRAMETYPE) #define WLAN_GET_SEQ_FRAG(seq) ((seq) & RTLLIB_SCTL_FRAG) #define WLAN_GET_SEQ_SEQ(seq) (((seq) & RTLLIB_SCTL_SEQ) >> 4) =20 diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index de1702491191..5de57331c1cf 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -197,7 +197,7 @@ inline void softmac_mgmt_xmit(struct sk_buff *skb, stru= ct rtllib_device *ieee) /* called with 2nd param 0, no mgmt lock required */ rtllib_sta_wakeup(ieee, 0); =20 - if (le16_to_cpu(header->frame_ctl) =3D=3D RTLLIB_STYPE_BEACON) + if (ieee80211_is_beacon(header->frame_ctl)) tcb_desc->queue_index =3D BEACON_QUEUE; else tcb_desc->queue_index =3D MGNT_QUEUE; --=20 2.41.0 From nobody Thu Dec 18 09:39:17 2025 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 8B74CEE14A9 for ; Sat, 9 Sep 2023 18:20:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239309AbjIISUw (ORCPT ); Sat, 9 Sep 2023 14:20:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49196 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239279AbjIISUt (ORCPT ); Sat, 9 Sep 2023 14:20:49 -0400 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25BFA10CA for ; Sat, 9 Sep 2023 11:20:15 -0700 (PDT) Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-3175e1bb38cso523471f8f.1 for ; Sat, 09 Sep 2023 11:20:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694283613; x=1694888413; darn=vger.kernel.org; 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=410ZIi1RG8c1PqmFLipRBPm6x8PsGeT8nQJ7mls83l4=; b=A4ontzaRgcIXQipAT2NICRoYTS94lZvHWVzTlLCajrS/xICd9hGV92YZposqgUVlUa 9zp7lGfl96qn46fmv0B0mi2bwHQotI85uE/ERosxStADBIE19WU3g1GDSMlPtxZz4bxc /53eZ7gfoNC+xsj/Mf76G1roC2qsYwL318SbI4+lMlV0oIFaNwWKBwzzX4LPnhtR0WJt cCNkI6lsMpm+8mroBpDQgPZgMX+IO3xGEh3HeSjnxvVDs9pe7PiygK7FiByTB21oEXEQ vxTUrM71bEu/XSa8KiAQnR2EViowh828m2NhnMuQPAN7U/+sb2xreXmvXF5qpoNLiviI YfqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694283613; x=1694888413; 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=410ZIi1RG8c1PqmFLipRBPm6x8PsGeT8nQJ7mls83l4=; b=cHoqIOnrjM6fCGw2yB9sI56C7maDaWjBRkMSv+L4vTObUen5yH/IhWZFviVuE/XzTL v7D4XMiIz7TzRFW7hA8kP7uTyMNKIFDPLJzRtO6flgLsBsTAr+oc/UoSSYFpShghAONK 0BmcwUgGSdyD14Ixna18xyX6ZziG1H7QczS/Y1ujf87w5RsBOyZxqWqij2HTDP+v/sT3 x7/9/G5cF4UED/FocFEDP8X0niVqomsiZmh3nzXn8oASFHMlMLGsomEtYgsQ4XrjUmuh tmkDrJjbBTBGVycOpaCqU0e3gN//x/ZY8sMaLXob2o9v16lNAdfJjC4NomERDd6iILCM iKHg== X-Gm-Message-State: AOJu0YzTj7PVYApyU99ZoLrCbjBejS4Jqlin9HmnKMlwGWKHh1M+Ot86 wuDqosKcTaaxYyGUsBJpdHE= X-Google-Smtp-Source: AGHT+IFzDPo7N3GDVdGPJ8yY0Fz5QEfsV6SB/fGm0P3oFoCvLYNmLKWL7xHPcBMhe7Z6mMMiQpyo7w== X-Received: by 2002:a05:600c:1c91:b0:401:d8a4:17b0 with SMTP id k17-20020a05600c1c9100b00401d8a417b0mr4950184wms.2.1694283613441; Sat, 09 Sep 2023 11:20:13 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id n4-20020a05600c294400b003fbdbd0a7desm8388032wmd.27.2023.09.09.11.20.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Sep 2023 11:20:13 -0700 (PDT) Date: Sat, 9 Sep 2023 20:20:11 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 6/8] staging: rtl8192e: Replace rtl92e_disable_irq with rtl92e_irq_disable Message-ID: <257624d1aba49a922a8d061e80089b3b9d7d022e.1694282907.git.philipp.g.hortmann@gmail.com> 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" Replace rtl92e_disable_irq with rtl92e_irq_disable to increase readability. priv->irq_enabled =3D 0 was set in both functions. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h | 1 - drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 9 --------- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index 8adf53174239..e0500946dea5 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -1879,7 +1879,7 @@ void rtl92e_enable_irq(struct net_device *dev) rtl92e_writel(dev, INTA_MASK, priv->irq_mask[0]); } =20 -void rtl92e_disable_irq(struct net_device *dev) +void rtl92e_irq_disable(struct net_device *dev) { struct r8192_priv *priv =3D (struct r8192_priv *)rtllib_priv(dev); =20 diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.h index 11366fda4ec3..3c06e1da4408 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h @@ -17,7 +17,6 @@ void rtl92e_ack_irq(struct net_device *dev, u32 *p_inta); void rtl92e_enable_rx(struct net_device *dev); void rtl92e_enable_tx(struct net_device *dev); void rtl92e_enable_irq(struct net_device *dev); -void rtl92e_disable_irq(struct net_device *dev); void rtl92e_init_variables(struct net_device *dev); void rtl92e_start_beacon(struct net_device *dev); void rtl92e_set_reg(struct net_device *dev, u8 variable, u8 *val); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 50eb8f3494ec..055cd513d76a 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -236,15 +236,6 @@ void rtl92e_irq_enable(struct net_device *dev) rtl92e_enable_irq(dev); } =20 -void rtl92e_irq_disable(struct net_device *dev) -{ - struct r8192_priv *priv =3D rtllib_priv(dev); - - rtl92e_disable_irq(dev); - - priv->irq_enabled =3D 0; -} - static void _rtl92e_set_chan(struct net_device *dev, short ch) { struct r8192_priv *priv =3D rtllib_priv(dev); --=20 2.41.0 From nobody Thu Dec 18 09:39:17 2025 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 C5D64EE14AA for ; Sat, 9 Sep 2023 18:20:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239338AbjIISUx (ORCPT ); Sat, 9 Sep 2023 14:20:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41924 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239043AbjIISUw (ORCPT ); Sat, 9 Sep 2023 14:20:52 -0400 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D3CA6CCE for ; Sat, 9 Sep 2023 11:20:20 -0700 (PDT) Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-401e6ce2d9fso8867125e9.1 for ; Sat, 09 Sep 2023 11:20:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694283619; x=1694888419; darn=vger.kernel.org; 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=InFO5e10TT39/SdX7ezViSAF4gHuUpUJjSKidTX3SGs=; b=mWLt567JS1K0eX29MLXhxJWtqcw4zNf+QT8f3nuEaz8yMA0ZwoarLwbLq6tB+9rRYz dF7aV7hxVt2heeHqHGHjoGNOSjFFjQz6+/eRqcPfryIpyQFPsMG0/jesTY/e2gE0O7GU O4OJJwyPypMN0wkNqZMV9OiPiW33GnCHYiAA14i9iPfOH+OX/YA0qodBoVvthFrtgxuB Vdr0opKtXvXiS02I3aiw2NzvfEKgx6/TIgtvja8W874Tmi05Pu/h9RZZJfIDcuaazG7h hHddDwWsJd1BK3vT2xTLwBlPGDTbII29w9h454gZsFHri6tuVtEN1BcgZOUYJEzN0HRu +Whw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694283619; x=1694888419; 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=InFO5e10TT39/SdX7ezViSAF4gHuUpUJjSKidTX3SGs=; b=JbVLHAbjlw8x742B6+vasomllCB7rFWS00cIDH7xKKqmoTTHZlNfQEPKNYFOyU2jF2 354IV07qMfPgxLPACJyrCGIIndnQXTYyhdzM7XFvGuPCo5tTlHxzpSN+WUtKB0Jr+om/ 3mRs2FGfZf6cvFAmidWgFOilt4eoYVoIZJZAPtG0xgTtyrTTTZtSt4zO+DR37/0o+p6t aoKRzw2k8+e1xeAqka46Ftn/MXWU1EYSYGF5BuPmgVyOblzIWyGSF3vfVZW7FX4ItsB5 +Elrw1kXMl3AOM2yUC5Qpe0WeU0CfSOcmRVUh08VxGzlWob7G1/1hiKj44Vl+i4Ba5yp DaDA== X-Gm-Message-State: AOJu0YxwN3AoJHa2ycUbRZ6hpQu29Jv2T5KDr+ngbJMDdxWEL89wAn3V A5YdysgC2WXhd0rKH1ZXo2TLdIo4yBtzOQ== X-Google-Smtp-Source: AGHT+IFmHBu6ljIRTmRyYy1SpBZ1gCSVnv+p1A8zib68h/rTIWoSPqEsLOkbDRwo2oE1W8EpBvX7qw== X-Received: by 2002:a05:600c:1d0a:b0:401:c6a2:3cd5 with SMTP id l10-20020a05600c1d0a00b00401c6a23cd5mr4916851wms.2.1694283619199; Sat, 09 Sep 2023 11:20:19 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id l23-20020a1c7917000000b003fe17901fcdsm8447910wme.32.2023.09.09.11.20.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Sep 2023 11:20:18 -0700 (PDT) Date: Sat, 9 Sep 2023 20:20:17 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 7/8] staging: rtl8192e: Replace rtl92e_enable_irq with rtl92e_irq_enable 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" Replace rtl92e_enable_irq with rtl92e_irq_enable to increase readability. priv->irq_enabled =3D 1 was set in both functions. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h | 1 - drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 9 --------- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index e0500946dea5..70e1eff9c600 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -1870,7 +1870,7 @@ rtl92e_init_variables(struct net_device *dev) priv->bfirst_after_down =3D false; } =20 -void rtl92e_enable_irq(struct net_device *dev) +void rtl92e_irq_enable(struct net_device *dev) { struct r8192_priv *priv =3D (struct r8192_priv *)rtllib_priv(dev); =20 diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.h index 3c06e1da4408..14a091ae1b7d 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h @@ -16,7 +16,6 @@ bool rtl92e_is_rx_stuck(struct net_device *dev); void rtl92e_ack_irq(struct net_device *dev, u32 *p_inta); void rtl92e_enable_rx(struct net_device *dev); void rtl92e_enable_tx(struct net_device *dev); -void rtl92e_enable_irq(struct net_device *dev); void rtl92e_init_variables(struct net_device *dev); void rtl92e_start_beacon(struct net_device *dev); void rtl92e_set_reg(struct net_device *dev, u8 variable, u8 *val); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 055cd513d76a..63bf8be3fda5 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -227,15 +227,6 @@ static void _rtl92e_tx_timeout(struct net_device *dev,= unsigned int txqueue) netdev_info(dev, "TXTIMEOUT"); } =20 -void rtl92e_irq_enable(struct net_device *dev) -{ - struct r8192_priv *priv =3D rtllib_priv(dev); - - priv->irq_enabled =3D 1; - - rtl92e_enable_irq(dev); -} - static void _rtl92e_set_chan(struct net_device *dev, short ch) { struct r8192_priv *priv =3D rtllib_priv(dev); --=20 2.41.0 From nobody Thu Dec 18 09:39:17 2025 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 25B86EE14AA for ; Sat, 9 Sep 2023 18:20:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239043AbjIISU7 (ORCPT ); Sat, 9 Sep 2023 14:20:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42058 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239802AbjIISU5 (ORCPT ); Sat, 9 Sep 2023 14:20:57 -0400 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D840910EB for ; Sat, 9 Sep 2023 11:20:26 -0700 (PDT) Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-401d61e9fecso9086115e9.0 for ; Sat, 09 Sep 2023 11:20:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694283625; x=1694888425; darn=vger.kernel.org; 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=jSwFvBNQ2AMCc4pS5SxTSy3TPsMqYhfRv4nOtRztjH4=; b=A4E3+0W5c0wJGiqtrd0SkQonhn6FTlMkEgosdJVOsmaQZxt9WrXxxgcfHEXuuv9GlS N2g3sHYqsSpzZv5votiwfrmq8Jc7c/Ewgxiy+kmHEGWAYOvCDxXTiMp8Yh6fmck+1lvz xfTcz1j5g11L1yW7IowPhglxaVnWixY9FA/jcTpLCMiLwOjexp305xNTMD0GXCaJD1i9 MsrwuEjcvNVmyZGFvade4X6P4aOR46fCeJTPQz/TT2XfanE6WXf+tHzdC47YJMZ0BRb5 juHXgHuhj/sQcvv1gGrnYzasG/Ak8DYHPY/JuJrJ4VyNEDZ6M/xQ/LWAez1ANyBQorQn Mf0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694283625; x=1694888425; 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=jSwFvBNQ2AMCc4pS5SxTSy3TPsMqYhfRv4nOtRztjH4=; b=NMQR6UwTT7QCUVv5QJXXHz8xWlNQJ9KfEv16as9le3ARIKeTGR6HrkNiifhsAHPuEB 2LgZvqdX8LykVLIG4QZiIwgY1mOmm3g4gShFVKP2VRtQYyF/7qSc537Q0tr2VDsHuinX Yfb1KSRBOL/ZYyXyBS82KxNDaMjZSqZNWF6g052MFbGzQhmEoaRrSYxCS96lnzb1ed3J 2/bfqp6GUU5k1fy3YngZAiP4r6MC5kQrdN5nbCNgg3XLazrdTn2hWssT59C3Okj0g2NL lciLEYK9UqkoAZe+scodHlw1mYzNCRRaSeqAed3GFBcxPIfJj46WfxO/W9EIfSCs/rw+ Bcig== X-Gm-Message-State: AOJu0YxGNbEGVDU1Fj6KA5jN04/qjl9RIOUqZCG7RuERMzHiz4GesfwW 7RlYM1yLkuw16d0kN+lLh+k= X-Google-Smtp-Source: AGHT+IGYzLWM2bWX2MqgLDzD2AesQMqSmGp4wAHxG4NYNRnSG7mwZwWtOjrIvDOjnkEpxeFYr1ZZ5A== X-Received: by 2002:a05:600c:3ba6:b0:3ff:8617:672b with SMTP id n38-20020a05600c3ba600b003ff8617672bmr4974721wms.2.1694283625280; Sat, 09 Sep 2023 11:20:25 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id l19-20020a05600c4f1300b00403038d7652sm2192312wmq.39.2023.09.09.11.20.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Sep 2023 11:20:25 -0700 (PDT) Date: Sat, 9 Sep 2023 20:20:23 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 8/8] staging: rtl8192e: Remove rtllib_get_payload() 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" rtllib_process_action() is only called in one place with management frames. Frame is passed over to rtllib_get_payload() which passes it to rtllib_get_hdrlen(). In rtllib_get_hdrlen() all management frames return with hdrlen =3D RTLLIB_3ADDR_LEN. Therefore the switch in rtllib_get_payload() is useless and dead code. The condition act =3D=3D NULL cannot occur and can also be removed. Then rtllib_hdr_2addr is not used anymore and can be removed as well. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtllib.h | 23 ----------------------- drivers/staging/rtl8192e/rtllib_softmac.c | 9 +-------- 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index 7dfb93f0590c..565a6e41b982 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -692,14 +692,6 @@ struct rtllib_hdr_1addr { u8 payload[]; } __packed; =20 -struct rtllib_hdr_2addr { - __le16 frame_ctl; - __le16 duration_id; - u8 addr1[ETH_ALEN]; - u8 addr2[ETH_ALEN]; - u8 payload[]; -} __packed; - struct rtllib_hdr_3addr { __le16 frame_ctl; __le16 duration_id; @@ -1781,21 +1773,6 @@ static inline int rtllib_get_hdrlen(u16 fc) return hdrlen; } =20 -static inline u8 *rtllib_get_payload(struct rtllib_hdr *hdr) -{ - switch (rtllib_get_hdrlen(le16_to_cpu(hdr->frame_ctl))) { - case RTLLIB_1ADDR_LEN: - return ((struct rtllib_hdr_1addr *)hdr)->payload; - case RTLLIB_2ADDR_LEN: - return ((struct rtllib_hdr_2addr *)hdr)->payload; - case RTLLIB_3ADDR_LEN: - return ((struct rtllib_hdr_3addr *)hdr)->payload; - case RTLLIB_4ADDR_LEN: - return ((struct rtllib_hdr_4addr *)hdr)->payload; - } - return NULL; -} - static inline int rtllib_is_ofdm_rate(u8 rate) { switch (rate & ~RTLLIB_BASIC_RATE_MASK) { diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index 5de57331c1cf..904be0ef867f 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -1921,16 +1921,9 @@ EXPORT_SYMBOL(rtllib_ps_tx_ack); static void rtllib_process_action(struct rtllib_device *ieee, struct sk_buff *skb) { - struct rtllib_hdr_3addr *header =3D (struct rtllib_hdr_3addr *)skb->data; - u8 *act =3D rtllib_get_payload((struct rtllib_hdr *)header); + u8 *act =3D skb->data + RTLLIB_3ADDR_LEN; u8 category =3D 0; =20 - if (act =3D=3D NULL) { - netdev_warn(ieee->dev, - "Error getting payload of action frame\n"); - return; - } - category =3D *act; act++; switch (category) { --=20 2.41.0