From nobody Thu Apr 9 00:17:58 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 9D4D2FA3744 for ; Mon, 31 Oct 2022 20:55:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230183AbiJaUzP (ORCPT ); Mon, 31 Oct 2022 16:55:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230106AbiJaUy6 (ORCPT ); Mon, 31 Oct 2022 16:54:58 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B5FCFD10E for ; Mon, 31 Oct 2022 13:54:57 -0700 (PDT) Received: from dslb-084-059-234-234.084.059.pools.vodafone-ip.de ([84.59.234.234] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1opbo5-0006z9-R0; Mon, 31 Oct 2022 21:54:53 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser , Joe Perches Subject: [PATCH 1/3] staging: r8188eu: use ether_addr_equal for address comparison Date: Mon, 31 Oct 2022 21:54:10 +0100 Message-Id: <20221031205412.124871-2-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221031205412.124871-1-martin@kaiser.cx> References: <20221031205412.124871-1-martin@kaiser.cx> 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" We can use ether_addr_equal instead of memcmp in update_recvframe_phyinfo_88e for comparing the incoming frame's destination address with our local address. Both struct ieee80211_hdr and struct eeprom_priv's mac_addr component are 2-byte aligned. Suggested-by: Joe Perches Signed-off-by: Martin Kaiser Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c b/drivers/stagin= g/r8188eu/hal/rtl8188e_rxdesc.c index f01ae71bcdb1..10bb2e602984 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c @@ -126,8 +126,8 @@ void update_recvframe_phyinfo_88e(struct recv_frame *pr= ecvframe, struct phy_stat get_bssid(&padapter->mlmepriv), ETH_ALEN)); =20 pkt_info.bPacketToSelf =3D pkt_info.bPacketMatchBSSID && - (!memcmp(ieee80211_get_DA(hdr), - myid(&padapter->eeprompriv), ETH_ALEN)); + ether_addr_equal(ieee80211_get_DA(hdr), + myid(&padapter->eeprompriv)); =20 pkt_info.bPacketBeacon =3D pkt_info.bPacketMatchBSSID && ieee80211_is_bea= con(fc); if (pkt_info.bPacketBeacon) { --=20 2.30.2 From nobody Thu Apr 9 00:17:58 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 D5E86FA3747 for ; Mon, 31 Oct 2022 20:55:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230229AbiJaUzV (ORCPT ); Mon, 31 Oct 2022 16:55:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41056 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230141AbiJaUy7 (ORCPT ); Mon, 31 Oct 2022 16:54:59 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F33FDD10E for ; Mon, 31 Oct 2022 13:54:58 -0700 (PDT) Received: from dslb-084-059-234-234.084.059.pools.vodafone-ip.de ([84.59.234.234] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1opbo6-0006z9-US; Mon, 31 Oct 2022 21:54:55 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 2/3] staging: r8188eu: use hdr->frame_control instead of fc Date: Mon, 31 Oct 2022 21:54:11 +0100 Message-Id: <20221031205412.124871-3-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221031205412.124871-1-martin@kaiser.cx> References: <20221031205412.124871-1-martin@kaiser.cx> 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" We can remove the fc variable in update_recvframe_phyinfo_88e and use hdr->frame_control instead. Signed-off-by: Martin Kaiser Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c b/drivers/stagin= g/r8188eu/hal/rtl8188e_rxdesc.c index 10bb2e602984..4e9d8c8285c4 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c @@ -114,13 +114,12 @@ void update_recvframe_phyinfo_88e(struct recv_frame *= precvframe, struct phy_stat struct hal_data_8188e *pHalData =3D &padapter->haldata; struct phy_info *pPHYInfo =3D &pattrib->phy_info; u8 *wlanhdr =3D precvframe->rx_data; - __le16 fc =3D *(__le16 *)wlanhdr; struct odm_per_pkt_info pkt_info; u8 *sa =3D NULL; struct sta_priv *pstapriv; struct sta_info *psta; =20 - pkt_info.bPacketMatchBSSID =3D ((!ieee80211_is_ctl(fc)) && + pkt_info.bPacketMatchBSSID =3D ((!ieee80211_is_ctl(hdr->frame_control)) && !pattrib->icv_err && !pattrib->crc_err && !memcmp(get_hdr_bssid(wlanhdr), get_bssid(&padapter->mlmepriv), ETH_ALEN)); @@ -129,7 +128,8 @@ void update_recvframe_phyinfo_88e(struct recv_frame *pr= ecvframe, struct phy_stat ether_addr_equal(ieee80211_get_DA(hdr), myid(&padapter->eeprompriv)); =20 - pkt_info.bPacketBeacon =3D pkt_info.bPacketMatchBSSID && ieee80211_is_bea= con(fc); + pkt_info.bPacketBeacon =3D pkt_info.bPacketMatchBSSID && + ieee80211_is_beacon(hdr->frame_control); if (pkt_info.bPacketBeacon) { if (check_fwstate(&padapter->mlmepriv, WIFI_STATION_STATE)) sa =3D padapter->mlmepriv.cur_network.network.MacAddress; --=20 2.30.2 From nobody Thu Apr 9 00:17:58 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 C6706FA3741 for ; Mon, 31 Oct 2022 20:55:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230206AbiJaUzS (ORCPT ); Mon, 31 Oct 2022 16:55:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41062 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230162AbiJaUzA (ORCPT ); Mon, 31 Oct 2022 16:55:00 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B872C12762 for ; Mon, 31 Oct 2022 13:54:59 -0700 (PDT) Received: from dslb-084-059-234-234.084.059.pools.vodafone-ip.de ([84.59.234.234] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1opbo8-0006z9-8f; Mon, 31 Oct 2022 21:54:56 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 3/3] staging: r8188eu: use ieee80211_get_SA Date: Mon, 31 Oct 2022 21:54:12 +0100 Message-Id: <20221031205412.124871-4-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221031205412.124871-1-martin@kaiser.cx> References: <20221031205412.124871-1-martin@kaiser.cx> 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" Use ieee80211_get_SA in update_recvframe_phyinfo_88e instead of the driver-specific get_sa function. Signed-off-by: Martin Kaiser Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c b/drivers/stagin= g/r8188eu/hal/rtl8188e_rxdesc.c index 4e9d8c8285c4..9a61eef8550b 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c @@ -135,7 +135,7 @@ void update_recvframe_phyinfo_88e(struct recv_frame *pr= ecvframe, struct phy_stat sa =3D padapter->mlmepriv.cur_network.network.MacAddress; /* to do Ad-hoc */ } else { - sa =3D get_sa(wlanhdr); + sa =3D ieee80211_get_SA(hdr); } =20 pstapriv =3D &padapter->stapriv; --=20 2.30.2