From nobody Sun Apr 19 00:26:07 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 15CBECCA479 for ; Thu, 7 Jul 2022 19:49:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236808AbiGGTta (ORCPT ); Thu, 7 Jul 2022 15:49:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32840 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236769AbiGGTt0 (ORCPT ); Thu, 7 Jul 2022 15:49:26 -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 AD88113D2C for ; Thu, 7 Jul 2022 12:49:25 -0700 (PDT) Received: from dslb-188-097-214-244.188.097.pools.vodafone-ip.de ([188.97.214.244] 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 1o9XV3-0008AP-Ke; Thu, 07 Jul 2022 21:49:21 +0200 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 1/2] staging: r8188eu: remove sta2sta_data_frame prototype Date: Thu, 7 Jul 2022 21:49:13 +0200 Message-Id: <20220707194914.63794-2-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220707194914.63794-1-martin@kaiser.cx> References: <20220707194914.63794-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" Remove the prototype for sta2sta_data_frame. Make the function static, it is used only inside rtw_recv.c. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_recv.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_recv.c b/drivers/staging/r818= 8eu/core/rtw_recv.c index 32cd452d1f3d..6a2a1b1664ac 100644 --- a/drivers/staging/r8188eu/core/rtw_recv.c +++ b/drivers/staging/r8188eu/core/rtw_recv.c @@ -556,13 +556,8 @@ static void count_rx_stats(struct adapter *padapter, s= truct recv_frame *prframe, } } =20 -int sta2sta_data_frame( - struct adapter *adapter, - struct recv_frame *precv_frame, - struct sta_info **psta -); - -int sta2sta_data_frame(struct adapter *adapter, struct recv_frame *precv_f= rame, struct sta_info **psta) +static int sta2sta_data_frame(struct adapter *adapter, + struct recv_frame *precv_frame, struct sta_info **psta) { u8 *ptr =3D precv_frame->rx_data; int ret =3D _SUCCESS; --=20 2.30.2 From nobody Sun Apr 19 00:26:07 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 8812EC43334 for ; Thu, 7 Jul 2022 19:49:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236816AbiGGTtc (ORCPT ); Thu, 7 Jul 2022 15:49:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236795AbiGGTt2 (ORCPT ); Thu, 7 Jul 2022 15:49:28 -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 8D33F15A24 for ; Thu, 7 Jul 2022 12:49:26 -0700 (PDT) Received: from dslb-188-097-214-244.188.097.pools.vodafone-ip.de ([188.97.214.244] 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 1o9XV4-0008AP-JN; Thu, 07 Jul 2022 21:49:22 +0200 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/2] staging: r8188eu: pattrib addresses were already set by the caller Date: Thu, 7 Jul 2022 21:49:14 +0200 Message-Id: <20220707194914.63794-3-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220707194914.63794-1-martin@kaiser.cx> References: <20220707194914.63794-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" Do not set pattrib's src, dst, bssid, ra and ta again in sta2sta_data_frame. sta2sta_data_frame is called from validate_recv_data_frame when both to_ds and from_ds are 0. All pattrib address fields have already been set to the correct addresses when sta2sta_data_frame is called. memcpy(pattrib->dst, ieee80211_get_DA(hdr), ETH_ALEN); ieee80211_get_DA returns addr1 if to_ds and from_ds are 0 memcpy(pattrib->src, ieee80211_get_SA(hdr), ETH_ALEN); ieee80211_get_SA returns addr2 if to_ds and from_ds are 0 memcpy(pattrib->ra, hdr->addr1, ETH_ALEN); memcpy(pattrib->ta, hdr->addr2, ETH_ALEN); For pattrib->dst =3D=3D addr1, pattrib->src =3D=3D addr2, these assignments match those in sta2sta_data_frame that this patch removes. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_recv.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_recv.c b/drivers/staging/r818= 8eu/core/rtw_recv.c index 6a2a1b1664ac..e5a7b7dfc387 100644 --- a/drivers/staging/r8188eu/core/rtw_recv.c +++ b/drivers/staging/r8188eu/core/rtw_recv.c @@ -559,7 +559,6 @@ static void count_rx_stats(struct adapter *padapter, st= ruct recv_frame *prframe, static int sta2sta_data_frame(struct adapter *adapter, struct recv_frame *precv_frame, struct sta_info **psta) { - u8 *ptr =3D precv_frame->rx_data; int ret =3D _SUCCESS; struct rx_pkt_attrib *pattrib =3D &precv_frame->attrib; struct sta_priv *pstapriv =3D &adapter->stapriv; @@ -614,12 +613,6 @@ static int sta2sta_data_frame(struct adapter *adapter, sta_addr =3D pattrib->src; } } else if (check_fwstate(pmlmepriv, WIFI_MP_STATE)) { - memcpy(pattrib->dst, GetAddr1Ptr(ptr), ETH_ALEN); - memcpy(pattrib->src, GetAddr2Ptr(ptr), ETH_ALEN); - memcpy(pattrib->bssid, GetAddr3Ptr(ptr), ETH_ALEN); - memcpy(pattrib->ra, pattrib->dst, ETH_ALEN); - memcpy(pattrib->ta, pattrib->src, ETH_ALEN); - sta_addr =3D mybssid; } else { ret =3D _FAIL; --=20 2.30.2