From nobody Wed Apr 8 06:45:18 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 C68F8C38A2D for ; Mon, 24 Oct 2022 08:14:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230038AbiJXIOl (ORCPT ); Mon, 24 Oct 2022 04:14:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229971AbiJXIOd (ORCPT ); Mon, 24 Oct 2022 04:14:33 -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 8856912093 for ; Mon, 24 Oct 2022 01:14:30 -0700 (PDT) Received: from ipservice-092-217-079-032.092.217.pools.vodafone-ip.de ([92.217.79.32] 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 1omsbK-0000nk-HT; Mon, 24 Oct 2022 10:14:26 +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 01/17] staging: r8188eu: restructure mlme subfunction handling Date: Mon, 24 Oct 2022 10:14:01 +0200 Message-Id: <20221024081417.66441-2-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221024081417.66441-1-martin@kaiser.cx> References: <20221024081417.66441-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" Move some code around in rtw_mlme_ext.c to make it simpler. mlme_sta_tbl is used only by mgt_dispatcher. Move the table inside the function. Move mgt_dispatcher behind the handler functions. We can then make the handler functions static. Signed-off-by: Martin Kaiser Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 116 ++++++++++---------- 1 file changed, 57 insertions(+), 59 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index d44e455f09ca..15b7148fa898 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -12,24 +12,6 @@ #include "../include/rtl8188e_xmit.h" #include "../include/rtl8188e_dm.h" =20 -/* response function for each management frame subtype, do not reorder */ -static mlme_handler mlme_sta_tbl[] =3D { - OnAssocReq, - OnAssocRsp, - OnAssocReq, - OnAssocRsp, - OnProbeReq, - OnProbeRsp, - NULL, - NULL, - OnBeacon, - NULL, - OnDisassoc, - OnAuthClient, - OnDeAuth, - OnAction, -}; - static u8 null_addr[ETH_ALEN] =3D {0, 0, 0, 0, 0, 0}; =20 /************************************************** @@ -393,47 +375,6 @@ void free_mlme_ext_priv(struct mlme_ext_priv *pmlmeext) } } =20 -void mgt_dispatcher(struct adapter *padapter, struct recv_frame *precv_fra= me) -{ - int index; - mlme_handler fct; - struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; - struct ieee80211_hdr *hdr =3D (struct ieee80211_hdr *)precv_frame->rx_dat= a; - struct sta_info *psta =3D rtw_get_stainfo(&padapter->stapriv, hdr->addr2); - - if (!ieee80211_is_mgmt(hdr->frame_control)) - return; - - /* receive the frames that ra(a1) is my address or ra(a1) is bc address. = */ - if (memcmp(hdr->addr1, myid(&padapter->eeprompriv), ETH_ALEN) && - !is_broadcast_ether_addr(hdr->addr1)) - return; - - index =3D (le16_to_cpu(hdr->frame_control) & IEEE80211_FCTL_STYPE) >> 4; - if (index >=3D ARRAY_SIZE(mlme_sta_tbl)) - return; - fct =3D mlme_sta_tbl[index]; - - if (psta) { - if (ieee80211_has_retry(hdr->frame_control)) { - if (precv_frame->attrib.seq_num =3D=3D psta->RxMgmtFrameSeqNum) - /* drop the duplicate management frame */ - return; - } - psta->RxMgmtFrameSeqNum =3D precv_frame->attrib.seq_num; - } - - if (ieee80211_is_auth(hdr->frame_control)) { - if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) - fct =3D OnAuth; - else - fct =3D OnAuthClient; - } - - if (fct) - fct(padapter, precv_frame); -} - static u32 p2p_listen_state_process(struct adapter *padapter, unsigned cha= r *da) { bool response =3D true; @@ -4004,6 +3945,63 @@ struct xmit_frame *alloc_mgtxmitframe(struct xmit_pr= iv *pxmitpriv) return pmgntframe; } =20 +void mgt_dispatcher(struct adapter *padapter, struct recv_frame *precv_fra= me) +{ + mlme_handler mlme_sta_tbl[] =3D { + OnAssocReq, + OnAssocRsp, + OnAssocReq, + OnAssocRsp, + OnProbeReq, + OnProbeRsp, + NULL, + NULL, + OnBeacon, + NULL, + OnDisassoc, + OnAuthClient, + OnDeAuth, + OnAction, + }; + int index; + mlme_handler fct; + struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; + struct ieee80211_hdr *hdr =3D (struct ieee80211_hdr *)precv_frame->rx_dat= a; + struct sta_info *psta =3D rtw_get_stainfo(&padapter->stapriv, hdr->addr2); + + if (!ieee80211_is_mgmt(hdr->frame_control)) + return; + + /* receive the frames that ra(a1) is my address or ra(a1) is bc address. = */ + if (memcmp(hdr->addr1, myid(&padapter->eeprompriv), ETH_ALEN) && + !is_broadcast_ether_addr(hdr->addr1)) + return; + + index =3D (le16_to_cpu(hdr->frame_control) & IEEE80211_FCTL_STYPE) >> 4; + if (index >=3D ARRAY_SIZE(mlme_sta_tbl)) + return; + fct =3D mlme_sta_tbl[index]; + + if (psta) { + if (ieee80211_has_retry(hdr->frame_control)) { + if (precv_frame->attrib.seq_num =3D=3D psta->RxMgmtFrameSeqNum) + /* drop the duplicate management frame */ + return; + } + psta->RxMgmtFrameSeqNum =3D precv_frame->attrib.seq_num; + } + + if (ieee80211_is_auth(hdr->frame_control)) { + if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) + fct =3D OnAuth; + else + fct =3D OnAuthClient; + } + + if (fct) + fct(padapter, precv_frame); +} + /*************************************************************************= *** =20 Following are some TX functions for WiFi MLME --=20 2.30.2 From nobody Wed Apr 8 06:45:18 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 5AD3EC38A2D for ; Mon, 24 Oct 2022 08:14:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230200AbiJXIOr (ORCPT ); Mon, 24 Oct 2022 04:14:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230035AbiJXIOg (ORCPT ); Mon, 24 Oct 2022 04:14:36 -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 3EF8A64C8 for ; Mon, 24 Oct 2022 01:14:32 -0700 (PDT) Received: from ipservice-092-217-079-032.092.217.pools.vodafone-ip.de ([92.217.79.32] 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 1omsbL-0000nk-DN; Mon, 24 Oct 2022 10:14:27 +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 02/17] staging: r8188eu: make OnAssocReq static Date: Mon, 24 Oct 2022 10:14:02 +0200 Message-Id: <20221024081417.66441-3-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221024081417.66441-1-martin@kaiser.cx> References: <20221024081417.66441-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" OnAssocReq is used only in rtw_mlme_ext.c. Make this function static. Signed-off-by: Martin Kaiser Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 2 +- drivers/staging/r8188eu/include/rtw_mlme_ext.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 15b7148fa898..4e7d9a273fe4 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -911,7 +911,7 @@ static void UpdateBrateTblForSoftAP(u8 *bssrateset, u32= bssratelen) } } =20 -unsigned int OnAssocReq(struct adapter *padapter, struct recv_frame *precv= _frame) +static unsigned int OnAssocReq(struct adapter *padapter, struct recv_frame= *precv_frame) { u16 capab_info; struct rtw_ieee802_11_elems elems; diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/stagi= ng/r8188eu/include/rtw_mlme_ext.h index 66aa8b497aa1..41e31cec9abe 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h +++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h @@ -536,8 +536,6 @@ void start_clnt_auth(struct adapter *padapter); void start_clnt_join(struct adapter *padapter); void start_create_ibss(struct adapter *padapter); =20 -unsigned int OnAssocReq(struct adapter *padapter, - struct recv_frame *precv_frame); unsigned int OnAssocRsp(struct adapter *padapter, struct recv_frame *precv_frame); unsigned int OnProbeReq(struct adapter *padapter, --=20 2.30.2 From nobody Wed Apr 8 06:45:18 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 5A5C5C38A2D for ; Mon, 24 Oct 2022 08:14:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230121AbiJXIO5 (ORCPT ); Mon, 24 Oct 2022 04:14:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229720AbiJXIOh (ORCPT ); Mon, 24 Oct 2022 04:14:37 -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 60F93220DA for ; Mon, 24 Oct 2022 01:14:32 -0700 (PDT) Received: from ipservice-092-217-079-032.092.217.pools.vodafone-ip.de ([92.217.79.32] 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 1omsbM-0000nk-5v; Mon, 24 Oct 2022 10:14:28 +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 03/17] staging: r8188eu: make OnAssocRsp static Date: Mon, 24 Oct 2022 10:14:03 +0200 Message-Id: <20221024081417.66441-4-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221024081417.66441-1-martin@kaiser.cx> References: <20221024081417.66441-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" OnAssocRsp is used only in rtw_mlme_ext.c. Make this function static. Signed-off-by: Martin Kaiser Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 2 +- drivers/staging/r8188eu/include/rtw_mlme_ext.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 4e7d9a273fe4..0b46da9de47c 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -1319,7 +1319,7 @@ static unsigned int OnAssocReq(struct adapter *padapt= er, struct recv_frame *prec return _FAIL; } =20 -unsigned int OnAssocRsp(struct adapter *padapter, struct recv_frame *precv= _frame) +static unsigned int OnAssocRsp(struct adapter *padapter, struct recv_frame= *precv_frame) { struct ieee80211_mgmt *mgmt =3D (struct ieee80211_mgmt *)precv_frame->rx_= data; uint i; diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/stagi= ng/r8188eu/include/rtw_mlme_ext.h index 41e31cec9abe..c2b1aa2f378b 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h +++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h @@ -536,8 +536,6 @@ void start_clnt_auth(struct adapter *padapter); void start_clnt_join(struct adapter *padapter); void start_create_ibss(struct adapter *padapter); =20 -unsigned int OnAssocRsp(struct adapter *padapter, - struct recv_frame *precv_frame); unsigned int OnProbeReq(struct adapter *padapter, struct recv_frame *precv_frame); unsigned int OnProbeRsp(struct adapter *padapter, --=20 2.30.2 From nobody Wed Apr 8 06:45:18 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 64E8DFA373D for ; Mon, 24 Oct 2022 08:14:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230202AbiJXIOt (ORCPT ); Mon, 24 Oct 2022 04:14:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229937AbiJXIOg (ORCPT ); Mon, 24 Oct 2022 04:14:36 -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 C353FB1C9 for ; Mon, 24 Oct 2022 01:14:31 -0700 (PDT) Received: from ipservice-092-217-079-032.092.217.pools.vodafone-ip.de ([92.217.79.32] 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 1omsbM-0000nk-UY; Mon, 24 Oct 2022 10:14:29 +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 04/17] staging: r8188eu: make OnProbeReq static Date: Mon, 24 Oct 2022 10:14:04 +0200 Message-Id: <20221024081417.66441-5-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221024081417.66441-1-martin@kaiser.cx> References: <20221024081417.66441-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" OnProbeReq is used only in rtw_mlme_ext.c. Make this function static. Signed-off-by: Martin Kaiser Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 2 +- drivers/staging/r8188eu/include/rtw_mlme_ext.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 0b46da9de47c..4a0bea5f5052 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -447,7 +447,7 @@ Following are the callback functions for each subtype o= f the management frames =20 **************************************************************************= ***/ =20 -unsigned int OnProbeReq(struct adapter *padapter, struct recv_frame *precv= _frame) +static unsigned int OnProbeReq(struct adapter *padapter, struct recv_frame= *precv_frame) { unsigned int ielen; unsigned char *p; diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/stagi= ng/r8188eu/include/rtw_mlme_ext.h index c2b1aa2f378b..b24aae8108b6 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h +++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h @@ -536,8 +536,6 @@ void start_clnt_auth(struct adapter *padapter); void start_clnt_join(struct adapter *padapter); void start_create_ibss(struct adapter *padapter); =20 -unsigned int OnProbeReq(struct adapter *padapter, - struct recv_frame *precv_frame); unsigned int OnProbeRsp(struct adapter *padapter, struct recv_frame *precv_frame); unsigned int OnBeacon(struct adapter *padapter, --=20 2.30.2 From nobody Wed Apr 8 06:45:18 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 8D1E9C3A59D for ; Mon, 24 Oct 2022 08:15:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230228AbiJXIPD (ORCPT ); Mon, 24 Oct 2022 04:15:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40886 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230179AbiJXIOn (ORCPT ); Mon, 24 Oct 2022 04:14:43 -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 56B4B103B for ; Mon, 24 Oct 2022 01:14:35 -0700 (PDT) Received: from ipservice-092-217-079-032.092.217.pools.vodafone-ip.de ([92.217.79.32] 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 1omsbO-0000nk-8l; Mon, 24 Oct 2022 10:14:30 +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 05/17] staging: r8188eu: make OnProbeRsp static Date: Mon, 24 Oct 2022 10:14:05 +0200 Message-Id: <20221024081417.66441-6-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221024081417.66441-1-martin@kaiser.cx> References: <20221024081417.66441-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" OnProbeRsp is used only in rtw_mlme_ext.c. Make this function static. Signed-off-by: Martin Kaiser Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 2 +- drivers/staging/r8188eu/include/rtw_mlme_ext.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 4a0bea5f5052..797c843de616 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -515,7 +515,7 @@ static unsigned int OnProbeReq(struct adapter *padapter= , struct recv_frame *prec return _SUCCESS; } =20 -unsigned int OnProbeRsp(struct adapter *padapter, struct recv_frame *precv= _frame) +static unsigned int OnProbeRsp(struct adapter *padapter, struct recv_frame= *precv_frame) { struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; struct wifidirect_info *pwdinfo =3D &padapter->wdinfo; diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/stagi= ng/r8188eu/include/rtw_mlme_ext.h index b24aae8108b6..52991ec7b3e8 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h +++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h @@ -536,8 +536,6 @@ void start_clnt_auth(struct adapter *padapter); void start_clnt_join(struct adapter *padapter); void start_create_ibss(struct adapter *padapter); =20 -unsigned int OnProbeRsp(struct adapter *padapter, - struct recv_frame *precv_frame); unsigned int OnBeacon(struct adapter *padapter, struct recv_frame *precv_frame); unsigned int OnDisassoc(struct adapter *padapter, --=20 2.30.2 From nobody Wed Apr 8 06:45:18 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 DDD11C3A59D for ; Mon, 24 Oct 2022 08:15:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230158AbiJXIPI (ORCPT ); Mon, 24 Oct 2022 04:15:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40898 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230183AbiJXIOn (ORCPT ); Mon, 24 Oct 2022 04:14:43 -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 E61831276A for ; Mon, 24 Oct 2022 01:14:36 -0700 (PDT) Received: from ipservice-092-217-079-032.092.217.pools.vodafone-ip.de ([92.217.79.32] 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 1omsbQ-0000nk-DZ; Mon, 24 Oct 2022 10:14:32 +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 06/17] staging: r8188eu: make OnBeacon static Date: Mon, 24 Oct 2022 10:14:06 +0200 Message-Id: <20221024081417.66441-7-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221024081417.66441-1-martin@kaiser.cx> References: <20221024081417.66441-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" OnBeacon is used only in rtw_mlme_ext.c. Make this function static. Signed-off-by: Martin Kaiser Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 2 +- drivers/staging/r8188eu/include/rtw_mlme_ext.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 797c843de616..07ed3d704c2d 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -561,7 +561,7 @@ static unsigned int OnProbeRsp(struct adapter *padapter= , struct recv_frame *prec return _SUCCESS; } =20 -unsigned int OnBeacon(struct adapter *padapter, struct recv_frame *precv_f= rame) +static unsigned int OnBeacon(struct adapter *padapter, struct recv_frame *= precv_frame) { int cam_idx; struct sta_info *psta; diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/stagi= ng/r8188eu/include/rtw_mlme_ext.h index 52991ec7b3e8..b4868598eba8 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h +++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h @@ -536,8 +536,6 @@ void start_clnt_auth(struct adapter *padapter); void start_clnt_join(struct adapter *padapter); void start_create_ibss(struct adapter *padapter); =20 -unsigned int OnBeacon(struct adapter *padapter, - struct recv_frame *precv_frame); unsigned int OnDisassoc(struct adapter *padapter, struct recv_frame *precv_frame); unsigned int OnAuth(struct adapter *padapter, --=20 2.30.2 From nobody Wed Apr 8 06:45:18 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 40EDAC3A59D for ; Mon, 24 Oct 2022 08:15:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230235AbiJXIPL (ORCPT ); Mon, 24 Oct 2022 04:15:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230181AbiJXIOn (ORCPT ); Mon, 24 Oct 2022 04:14:43 -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 56802D5C for ; Mon, 24 Oct 2022 01:14:36 -0700 (PDT) Received: from ipservice-092-217-079-032.092.217.pools.vodafone-ip.de ([92.217.79.32] 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 1omsbS-0000nk-BB; Mon, 24 Oct 2022 10:14:34 +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 07/17] staging: r8188eu: make OnDisassoc static Date: Mon, 24 Oct 2022 10:14:07 +0200 Message-Id: <20221024081417.66441-8-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221024081417.66441-1-martin@kaiser.cx> References: <20221024081417.66441-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" OnDisassoc is used only in rtw_mlme_ext.c. Make this function static. Signed-off-by: Martin Kaiser Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 2 +- drivers/staging/r8188eu/include/rtw_mlme_ext.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 07ed3d704c2d..dc836e5878d1 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -1458,7 +1458,7 @@ unsigned int OnDeAuth(struct adapter *padapter, struc= t recv_frame *precv_frame) return _SUCCESS; } =20 -unsigned int OnDisassoc(struct adapter *padapter, struct recv_frame *precv= _frame) +static unsigned int OnDisassoc(struct adapter *padapter, struct recv_frame= *precv_frame) { u16 reason; struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/stagi= ng/r8188eu/include/rtw_mlme_ext.h index b4868598eba8..c1bc554202a0 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h +++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h @@ -536,8 +536,6 @@ void start_clnt_auth(struct adapter *padapter); void start_clnt_join(struct adapter *padapter); void start_create_ibss(struct adapter *padapter); =20 -unsigned int OnDisassoc(struct adapter *padapter, - struct recv_frame *precv_frame); unsigned int OnAuth(struct adapter *padapter, struct recv_frame *precv_frame); unsigned int OnAuthClient(struct adapter *padapter, --=20 2.30.2 From nobody Wed Apr 8 06:45:18 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 9055AC3A59D for ; Mon, 24 Oct 2022 08:15:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229853AbiJXIPQ (ORCPT ); Mon, 24 Oct 2022 04:15:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230189AbiJXIOn (ORCPT ); Mon, 24 Oct 2022 04:14:43 -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 E65E115A19 for ; Mon, 24 Oct 2022 01:14:39 -0700 (PDT) Received: from ipservice-092-217-079-032.092.217.pools.vodafone-ip.de ([92.217.79.32] 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 1omsbU-0000nk-2s; Mon, 24 Oct 2022 10:14:36 +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 08/17] staging: r8188eu: make OnAuthClient static Date: Mon, 24 Oct 2022 10:14:08 +0200 Message-Id: <20221024081417.66441-9-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221024081417.66441-1-martin@kaiser.cx> References: <20221024081417.66441-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" OnAuthClient is used only in rtw_mlme_ext.c. Make this function static. Signed-off-by: Martin Kaiser Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 2 +- drivers/staging/r8188eu/include/rtw_mlme_ext.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index dc836e5878d1..7c9ca0c71b65 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -800,7 +800,7 @@ unsigned int OnAuth(struct adapter *padapter, struct re= cv_frame *precv_frame) return _FAIL; } =20 -unsigned int OnAuthClient(struct adapter *padapter, struct recv_frame *pre= cv_frame) +static unsigned int OnAuthClient(struct adapter *padapter, struct recv_fra= me *precv_frame) { unsigned int seq, len, status, offset; unsigned char *p; diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/stagi= ng/r8188eu/include/rtw_mlme_ext.h index c1bc554202a0..866d358f5f10 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h +++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h @@ -538,8 +538,6 @@ void start_create_ibss(struct adapter *padapter); =20 unsigned int OnAuth(struct adapter *padapter, struct recv_frame *precv_frame); -unsigned int OnAuthClient(struct adapter *padapter, - struct recv_frame *precv_frame); unsigned int OnDeAuth(struct adapter *padapter, struct recv_frame *precv_frame); unsigned int OnAction(struct adapter *padapter, --=20 2.30.2 From nobody Wed Apr 8 06:45:18 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 C2E49C3A59D for ; Mon, 24 Oct 2022 08:15:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229909AbiJXIP1 (ORCPT ); Mon, 24 Oct 2022 04:15:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230204AbiJXIOu (ORCPT ); Mon, 24 Oct 2022 04:14:50 -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 BD01822282 for ; Mon, 24 Oct 2022 01:14:42 -0700 (PDT) Received: from ipservice-092-217-079-032.092.217.pools.vodafone-ip.de ([92.217.79.32] 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 1omsbV-0000nk-1H; Mon, 24 Oct 2022 10:14:37 +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 09/17] staging: r8188eu: make OnDeAuth static Date: Mon, 24 Oct 2022 10:14:09 +0200 Message-Id: <20221024081417.66441-10-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221024081417.66441-1-martin@kaiser.cx> References: <20221024081417.66441-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" OnDeAuth is used only in rtw_mlme_ext.c. Make this function static. Signed-off-by: Martin Kaiser Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 2 +- drivers/staging/r8188eu/include/rtw_mlme_ext.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 7c9ca0c71b65..6c97df6f88fe 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -1396,7 +1396,7 @@ static unsigned int OnAssocRsp(struct adapter *padapt= er, struct recv_frame *prec return _SUCCESS; } =20 -unsigned int OnDeAuth(struct adapter *padapter, struct recv_frame *precv_f= rame) +static unsigned int OnDeAuth(struct adapter *padapter, struct recv_frame *= precv_frame) { struct ieee80211_mgmt *mgmt =3D (struct ieee80211_mgmt *)precv_frame->rx_= data; unsigned short reason; diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/stagi= ng/r8188eu/include/rtw_mlme_ext.h index 866d358f5f10..14df83574478 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h +++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h @@ -538,8 +538,6 @@ void start_create_ibss(struct adapter *padapter); =20 unsigned int OnAuth(struct adapter *padapter, struct recv_frame *precv_frame); -unsigned int OnDeAuth(struct adapter *padapter, - struct recv_frame *precv_frame); unsigned int OnAction(struct adapter *padapter, struct recv_frame *precv_frame); =20 --=20 2.30.2 From nobody Wed Apr 8 06:45:18 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 C7571C38A2D for ; Mon, 24 Oct 2022 08:15:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230281AbiJXIPh (ORCPT ); Mon, 24 Oct 2022 04:15:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230210AbiJXIOu (ORCPT ); Mon, 24 Oct 2022 04:14:50 -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 1673524BC0 for ; Mon, 24 Oct 2022 01:14:44 -0700 (PDT) Received: from ipservice-092-217-079-032.092.217.pools.vodafone-ip.de ([92.217.79.32] 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 1omsbV-0000nk-WA; Mon, 24 Oct 2022 10:14:38 +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 10/17] staging: r8188eu: make OnAction static Date: Mon, 24 Oct 2022 10:14:10 +0200 Message-Id: <20221024081417.66441-11-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221024081417.66441-1-martin@kaiser.cx> References: <20221024081417.66441-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" OnAction is used only in rtw_mlme_ext.c. Make this function static. Signed-off-by: Martin Kaiser Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 2 +- drivers/staging/r8188eu/include/rtw_mlme_ext.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 6c97df6f88fe..08f193781776 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -3906,7 +3906,7 @@ unsigned int OnAction_p2p(struct adapter *padapter, s= truct recv_frame *precv_fra return _SUCCESS; } =20 -unsigned int OnAction(struct adapter *padapter, struct recv_frame *precv_f= rame) +static unsigned int OnAction(struct adapter *padapter, struct recv_frame *= precv_frame) { struct ieee80211_mgmt *mgmt =3D (struct ieee80211_mgmt *)precv_frame->rx_= data; =20 diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/stagi= ng/r8188eu/include/rtw_mlme_ext.h index 14df83574478..f192733a5c53 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h +++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h @@ -538,8 +538,6 @@ void start_create_ibss(struct adapter *padapter); =20 unsigned int OnAuth(struct adapter *padapter, struct recv_frame *precv_frame); -unsigned int OnAction(struct adapter *padapter, - struct recv_frame *precv_frame); =20 unsigned int OnAction_back(struct adapter *padapter, struct recv_frame *precv_frame); --=20 2.30.2 From nobody Wed Apr 8 06:45:18 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 3DE6FFA373D for ; Mon, 24 Oct 2022 08:15:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230272AbiJXIPb (ORCPT ); Mon, 24 Oct 2022 04:15:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41452 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230206AbiJXIOu (ORCPT ); Mon, 24 Oct 2022 04:14:50 -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 BD91722B12 for ; Mon, 24 Oct 2022 01:14:42 -0700 (PDT) Received: from ipservice-092-217-079-032.092.217.pools.vodafone-ip.de ([92.217.79.32] 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 1omsbW-0000nk-T9; Mon, 24 Oct 2022 10:14:38 +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 11/17] staging: r8188eu: make OnAuth static Date: Mon, 24 Oct 2022 10:14:11 +0200 Message-Id: <20221024081417.66441-12-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221024081417.66441-1-martin@kaiser.cx> References: <20221024081417.66441-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" OnAuth is used only in rtw_mlme_ext.c. Make this function static. Signed-off-by: Martin Kaiser Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 2 +- drivers/staging/r8188eu/include/rtw_mlme_ext.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 08f193781776..34b41931fb66 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -651,7 +651,7 @@ static unsigned int OnBeacon(struct adapter *padapter, = struct recv_frame *precv_ return _SUCCESS; } =20 -unsigned int OnAuth(struct adapter *padapter, struct recv_frame *precv_fra= me) +static unsigned int OnAuth(struct adapter *padapter, struct recv_frame *pr= ecv_frame) { unsigned int auth_mode, ie_len; u16 seq; diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/stagi= ng/r8188eu/include/rtw_mlme_ext.h index f192733a5c53..f77e6dc81831 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h +++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h @@ -536,9 +536,6 @@ void start_clnt_auth(struct adapter *padapter); void start_clnt_join(struct adapter *padapter); void start_create_ibss(struct adapter *padapter); =20 -unsigned int OnAuth(struct adapter *padapter, - struct recv_frame *precv_frame); - unsigned int OnAction_back(struct adapter *padapter, struct recv_frame *precv_frame); unsigned int on_action_public(struct adapter *padapter, --=20 2.30.2 From nobody Wed Apr 8 06:45:18 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 89A2CC3A59D for ; Mon, 24 Oct 2022 08:15:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230206AbiJXIPf (ORCPT ); Mon, 24 Oct 2022 04:15:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41498 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230209AbiJXIOu (ORCPT ); Mon, 24 Oct 2022 04:14:50 -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 15EEE2497B for ; Mon, 24 Oct 2022 01:14:43 -0700 (PDT) Received: from ipservice-092-217-079-032.092.217.pools.vodafone-ip.de ([92.217.79.32] 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 1omsbX-0000nk-PL; Mon, 24 Oct 2022 10:14:40 +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 12/17] staging: r8188eu: change mlme handlers to void Date: Mon, 24 Oct 2022 10:14:12 +0200 Message-Id: <20221024081417.66441-13-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221024081417.66441-1-martin@kaiser.cx> References: <20221024081417.66441-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" The mlme handlers that are called from mgt_dispatcher return an error code. mgt_dispatcher doesn't check this error code, we can remove it and change the handler functions to void. For now, make only the minimum changes to the handlers for removing the error codes. If handlers can be simplified, that'll be done it separate patches. Signed-off-by: Martin Kaiser Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 93 ++++++++----------- .../staging/r8188eu/include/rtw_mlme_ext.h | 2 +- 2 files changed, 41 insertions(+), 54 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 34b41931fb66..074c95f76e27 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -447,7 +447,7 @@ Following are the callback functions for each subtype o= f the management frames =20 **************************************************************************= ***/ =20 -static unsigned int OnProbeReq(struct adapter *padapter, struct recv_frame= *precv_frame) +static void OnProbeReq(struct adapter *padapter, struct recv_frame *precv_= frame) { unsigned int ielen; unsigned char *p; @@ -481,17 +481,17 @@ static unsigned int OnProbeReq(struct adapter *padapt= er, struct recv_frame *prec report_survey_event(padapter, precv_frame); p2p_listen_state_process(padapter, get_sa(pframe)); =20 - return _SUCCESS; + return; } } } =20 if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) - return _SUCCESS; + return; =20 if (!check_fwstate(pmlmepriv, _FW_LINKED) && !check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE | WIFI_AP_STATE)) - return _SUCCESS; + return; =20 p =3D rtw_get_ie(pframe + WLAN_HDR_A3_LEN + _PROBEREQ_IE_OFFSET_, _SSID_I= E_, (int *)&ielen, len - WLAN_HDR_A3_LEN - _PROBEREQ_IE_OFFSET_); @@ -503,7 +503,7 @@ static unsigned int OnProbeReq(struct adapter *padapter= , struct recv_frame *prec =20 if ((ielen !=3D 0 && memcmp((void *)(p + 2), (void *)cur->Ssid.Ssid, cur= ->Ssid.SsidLength)) || (ielen =3D=3D 0 && pmlmeinfo->hidden_ssid_mode)) - return _SUCCESS; + return; =20 _issue_probersp: =20 @@ -512,10 +512,9 @@ static unsigned int OnProbeReq(struct adapter *padapte= r, struct recv_frame *prec check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE))) issue_probersp(padapter, get_sa(pframe), is_valid_p2p_probereq); } - return _SUCCESS; } =20 -static unsigned int OnProbeRsp(struct adapter *padapter, struct recv_frame= *precv_frame) +static void OnProbeRsp(struct adapter *padapter, struct recv_frame *precv_= frame) { struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; struct wifidirect_info *pwdinfo =3D &padapter->wdinfo; @@ -537,7 +536,7 @@ static unsigned int OnProbeRsp(struct adapter *padapter= , struct recv_frame *prec } } } - return _SUCCESS; + return; } else if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_ING)) { if (pwdinfo->nego_req_info.benable) { if (!memcmp(pwdinfo->nego_req_info.peerDevAddr, GetAddr2Ptr(pframe), ET= H_ALEN)) { @@ -555,13 +554,11 @@ static unsigned int OnProbeRsp(struct adapter *padapt= er, struct recv_frame *prec } if (pmlmeext->sitesurvey_res.state =3D=3D SCAN_PROCESS) { report_survey_event(padapter, precv_frame); - return _SUCCESS; + return; } - - return _SUCCESS; } =20 -static unsigned int OnBeacon(struct adapter *padapter, struct recv_frame *= precv_frame) +static void OnBeacon(struct adapter *padapter, struct recv_frame *precv_fr= ame) { int cam_idx; struct sta_info *psta; @@ -576,7 +573,7 @@ static unsigned int OnBeacon(struct adapter *padapter, = struct recv_frame *precv_ =20 if (pmlmeext->sitesurvey_res.state =3D=3D SCAN_PROCESS) { report_survey_event(padapter, precv_frame); - return _SUCCESS; + return; } =20 if (!memcmp(GetAddr3Ptr(pframe), get_my_bssid(&pmlmeinfo->network), ETH_A= LEN)) { @@ -600,7 +597,7 @@ static unsigned int OnBeacon(struct adapter *padapter, = struct recv_frame *precv_ /* start auth */ start_clnt_auth(padapter); =20 - return _SUCCESS; + return; } =20 if (((pmlmeinfo->state & 0x03) =3D=3D WIFI_FW_STATION_STATE) && (pmlmein= fo->state & WIFI_FW_ASSOC_SUCCESS)) { @@ -610,7 +607,7 @@ static unsigned int OnBeacon(struct adapter *padapter, = struct recv_frame *precv_ if (!ret) { receive_disconnect(padapter, pmlmeinfo->network.MacAddress, 0); - return _SUCCESS; + return; } /* update WMM, ERP in the beacon */ /* todo: the timer is used instead of the number of the beacon receive= d */ @@ -629,12 +626,12 @@ static unsigned int OnBeacon(struct adapter *padapter= , struct recv_frame *precv_ /* allocate a new CAM entry for IBSS station */ cam_idx =3D allocate_fw_sta_entry(padapter); if (cam_idx =3D=3D NUM_STA) - goto _END_ONBEACON_; + return; =20 /* get supported rate */ if (update_sta_support_rate(padapter, (pframe + WLAN_HDR_A3_LEN + _BEA= CON_IE_OFFSET_), (len - WLAN_HDR_A3_LEN - _BEACON_IE_OFFSET_), cam_idx) =3D= =3D _FAIL) { pmlmeinfo->FW_sta_info[cam_idx].status =3D 0; - goto _END_ONBEACON_; + return; } =20 /* update TSF Value */ @@ -645,13 +642,9 @@ static unsigned int OnBeacon(struct adapter *padapter,= struct recv_frame *precv_ } } } - -_END_ONBEACON_: - - return _SUCCESS; } =20 -static unsigned int OnAuth(struct adapter *padapter, struct recv_frame *pr= ecv_frame) +static void OnAuth(struct adapter *padapter, struct recv_frame *precv_fram= e) { unsigned int auth_mode, ie_len; u16 seq; @@ -668,7 +661,7 @@ static unsigned int OnAuth(struct adapter *padapter, st= ruct recv_frame *precv_fr uint len =3D precv_frame->len; =20 if ((pmlmeinfo->state & 0x03) !=3D WIFI_FW_AP_STATE) - return _FAIL; + return; =20 sa =3D GetAddr2Ptr(pframe); =20 @@ -784,7 +777,7 @@ static unsigned int OnAuth(struct adapter *padapter, st= ruct recv_frame *precv_fr if (pstat->state & WIFI_FW_AUTH_SUCCESS) pstat->auth_seq =3D 0; =20 - return _SUCCESS; + return; =20 auth_fail: =20 @@ -797,10 +790,9 @@ static unsigned int OnAuth(struct adapter *padapter, s= truct recv_frame *precv_fr memcpy(pstat->hwaddr, sa, 6); =20 issue_auth(padapter, pstat, (unsigned short)status); - return _FAIL; } =20 -static unsigned int OnAuthClient(struct adapter *padapter, struct recv_fra= me *precv_frame) +static void OnAuthClient(struct adapter *padapter, struct recv_frame *prec= v_frame) { unsigned int seq, len, status, offset; unsigned char *p; @@ -812,10 +804,10 @@ static unsigned int OnAuthClient(struct adapter *pada= pter, struct recv_frame *pr =20 /* check A1 matches or not */ if (memcmp(myid(&padapter->eeprompriv), get_da(pframe), ETH_ALEN)) - return _SUCCESS; + return; =20 if (!(pmlmeinfo->state & WIFI_FW_AUTH_STATE)) - return _SUCCESS; + return; =20 offset =3D (GetPrivacy(pframe)) ? 4 : 0; =20 @@ -848,7 +840,7 @@ static unsigned int OnAuthClient(struct adapter *padapt= er, struct recv_frame *pr issue_auth(padapter, NULL, 0); set_link_timer(pmlmeext, REAUTH_TO); =20 - return _SUCCESS; + return; } else { /* open system */ go2asoc =3D 1; @@ -865,10 +857,10 @@ static unsigned int OnAuthClient(struct adapter *pada= pter, struct recv_frame *pr =20 if (go2asoc) { start_clnt_assoc(padapter); - return _SUCCESS; + return; } authclnt_fail: - return _FAIL; + return; } =20 static void UpdateBrateTbl(u8 *mbrate) @@ -911,7 +903,7 @@ static void UpdateBrateTblForSoftAP(u8 *bssrateset, u32= bssratelen) } } =20 -static unsigned int OnAssocReq(struct adapter *padapter, struct recv_frame= *precv_frame) +static void OnAssocReq(struct adapter *padapter, struct recv_frame *precv_= frame) { u16 capab_info; struct rtw_ieee802_11_elems elems; @@ -937,7 +929,7 @@ static unsigned int OnAssocReq(struct adapter *padapter= , struct recv_frame *prec u32 p2pielen =3D 0; =20 if ((pmlmeinfo->state & 0x03) !=3D WIFI_FW_AP_STATE) - return _FAIL; + return; =20 frame_type =3D GetFrameSubType(pframe); if (frame_type =3D=3D WIFI_ASSOCREQ) @@ -946,7 +938,7 @@ static unsigned int OnAssocReq(struct adapter *padapter= , struct recv_frame *prec ie_offset =3D _REASOCREQ_IE_OFFSET_; =20 if (pkt_len < IEEE80211_3ADDR_LEN + ie_offset) - return _FAIL; + return; =20 pstat =3D rtw_get_stainfo(pstapriv, GetAddr2Ptr(pframe)); if (pstat =3D=3D (struct sta_info *)NULL) { @@ -1300,13 +1292,13 @@ static unsigned int OnAssocReq(struct adapter *pada= pter, struct recv_frame *prec report_add_sta_event(padapter, pstat->hwaddr, pstat->aid); } =20 - return _SUCCESS; + return; =20 asoc_class2_error: =20 issue_deauth(padapter, (void *)GetAddr2Ptr(pframe), status); =20 - return _FAIL; + return; =20 OnAssocReqFail: =20 @@ -1316,10 +1308,10 @@ static unsigned int OnAssocReq(struct adapter *pada= pter, struct recv_frame *prec else issue_asocrsp(padapter, status, pstat, WIFI_REASSOCRSP); =20 - return _FAIL; + return; } =20 -static unsigned int OnAssocRsp(struct adapter *padapter, struct recv_frame= *precv_frame) +static void OnAssocRsp(struct adapter *padapter, struct recv_frame *precv_= frame) { struct ieee80211_mgmt *mgmt =3D (struct ieee80211_mgmt *)precv_frame->rx_= data; uint i; @@ -1333,13 +1325,13 @@ static unsigned int OnAssocRsp(struct adapter *pada= pter, struct recv_frame *prec =20 /* check A1 matches or not */ if (memcmp(myid(&padapter->eeprompriv), mgmt->da, ETH_ALEN)) - return _SUCCESS; + return; =20 if (!(pmlmeinfo->state & (WIFI_FW_AUTH_SUCCESS | WIFI_FW_ASSOC_STATE))) - return _SUCCESS; + return; =20 if (pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) - return _SUCCESS; + return; =20 _cancel_timer_ex(&pmlmeext->link_timer); =20 @@ -1392,11 +1384,9 @@ static unsigned int OnAssocRsp(struct adapter *padap= ter, struct recv_frame *prec =20 report_assoc_result: report_join_res(padapter, res); - - return _SUCCESS; } =20 -static unsigned int OnDeAuth(struct adapter *padapter, struct recv_frame *= precv_frame) +static void OnDeAuth(struct adapter *padapter, struct recv_frame *precv_fr= ame) { struct ieee80211_mgmt *mgmt =3D (struct ieee80211_mgmt *)precv_frame->rx_= data; unsigned short reason; @@ -1406,7 +1396,7 @@ static unsigned int OnDeAuth(struct adapter *padapter= , struct recv_frame *precv_ struct wifidirect_info *pwdinfo =3D &padapter->wdinfo; =20 if (memcmp(mgmt->bssid, get_my_bssid(&pmlmeinfo->network), ETH_ALEN)) - return _SUCCESS; + return; =20 if (pwdinfo->rx_invitereq_info.scan_op_ch_only) { _cancel_timer_ex(&pwdinfo->reset_ch_sitesurvey); @@ -1422,7 +1412,7 @@ static unsigned int OnDeAuth(struct adapter *padapter= , struct recv_frame *precv_ =20 psta =3D rtw_get_stainfo(pstapriv, mgmt->sa); if (!psta) - return _SUCCESS; + return; =20 spin_lock_bh(&pstapriv->asoc_list_lock); if (!list_empty(&psta->asoc_list)) { @@ -1455,10 +1445,9 @@ static unsigned int OnDeAuth(struct adapter *padapte= r, struct recv_frame *precv_ =20 pmlmepriv->LinkDetectInfo.bBusyTraffic =3D false; } - return _SUCCESS; } =20 -static unsigned int OnDisassoc(struct adapter *padapter, struct recv_frame= *precv_frame) +static void OnDisassoc(struct adapter *padapter, struct recv_frame *precv_= frame) { u16 reason; struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; @@ -1469,7 +1458,7 @@ static unsigned int OnDisassoc(struct adapter *padapt= er, struct recv_frame *prec =20 /* check A3 */ if (!(!memcmp(GetAddr3Ptr(pframe), get_my_bssid(&pmlmeinfo->network), ETH= _ALEN))) - return _SUCCESS; + return; =20 if (pwdinfo->rx_invitereq_info.scan_op_ch_only) { _cancel_timer_ex(&pwdinfo->reset_ch_sitesurvey); @@ -1497,12 +1486,11 @@ static unsigned int OnDisassoc(struct adapter *pada= pter, struct recv_frame *prec associated_clients_update(padapter, updated); } =20 - return _SUCCESS; + return; } else { receive_disconnect(padapter, GetAddr3Ptr(pframe), reason); } pmlmepriv->LinkDetectInfo.bBusyTraffic =3D false; - return _SUCCESS; } =20 unsigned int OnAction_back(struct adapter *padapter, struct recv_frame *pr= ecv_frame) @@ -3906,7 +3894,7 @@ unsigned int OnAction_p2p(struct adapter *padapter, s= truct recv_frame *precv_fra return _SUCCESS; } =20 -static unsigned int OnAction(struct adapter *padapter, struct recv_frame *= precv_frame) +static void OnAction(struct adapter *padapter, struct recv_frame *precv_fr= ame) { struct ieee80211_mgmt *mgmt =3D (struct ieee80211_mgmt *)precv_frame->rx_= data; =20 @@ -3921,7 +3909,6 @@ static unsigned int OnAction(struct adapter *padapter= , struct recv_frame *precv_ OnAction_p2p(padapter, precv_frame); break; } - return _SUCCESS; } =20 struct xmit_frame *alloc_mgtxmitframe(struct xmit_priv *pxmitpriv) diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/stagi= ng/r8188eu/include/rtw_mlme_ext.h index f77e6dc81831..c8beaa927cba 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h +++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h @@ -184,7 +184,7 @@ enum SCAN_STATE { SCAN_STATE_MAX, }; =20 -typedef unsigned int (*mlme_handler)(struct adapter *adapt, struct recv_fr= ame *frame); +typedef void (*mlme_handler)(struct adapter *adapt, struct recv_frame *fra= me); =20 struct ss_res { int state; --=20 2.30.2 From nobody Wed Apr 8 06:45:18 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 48F23C3A59D for ; Mon, 24 Oct 2022 08:15:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230259AbiJXIPV (ORCPT ); Mon, 24 Oct 2022 04:15:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229937AbiJXIOu (ORCPT ); Mon, 24 Oct 2022 04:14:50 -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 EE25517A9E for ; Mon, 24 Oct 2022 01:14:46 -0700 (PDT) Received: from ipservice-092-217-079-032.092.217.pools.vodafone-ip.de ([92.217.79.32] 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 1omsbZ-0000nk-1l; Mon, 24 Oct 2022 10:14:41 +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 13/17] staging: r8188eu: remove unnecessary label Date: Mon, 24 Oct 2022 10:14:13 +0200 Message-Id: <20221024081417.66441-14-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221024081417.66441-1-martin@kaiser.cx> References: <20221024081417.66441-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 a label on OnAuthClient that just calls return. We can return directly instead of jumping to this label. Signed-off-by: Martin Kaiser Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 074c95f76e27..01fe5019b333 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -823,7 +823,7 @@ static void OnAuthClient(struct adapter *padapter, stru= ct recv_frame *precv_fram } =20 set_link_timer(pmlmeext, 1); - goto authclnt_fail; + return; } =20 if (seq =3D=3D 2) { @@ -833,7 +833,7 @@ static void OnAuthClient(struct adapter *padapter, stru= ct recv_frame *precv_fram pkt_len - WLAN_HDR_A3_LEN - _AUTH_IE_OFFSET_); =20 if (!p) - goto authclnt_fail; + return; =20 memcpy((void *)(pmlmeinfo->chg_txt), (void *)(p + 2), len); pmlmeinfo->auth_seq =3D 3; @@ -849,18 +849,16 @@ static void OnAuthClient(struct adapter *padapter, st= ruct recv_frame *precv_fram if (pmlmeinfo->auth_algo =3D=3D dot11AuthAlgrthm_Shared) go2asoc =3D 1; else - goto authclnt_fail; + return; } else { /* this is also illegal */ - goto authclnt_fail; + return; } =20 if (go2asoc) { start_clnt_assoc(padapter); return; } -authclnt_fail: - return; } =20 static void UpdateBrateTbl(u8 *mbrate) --=20 2.30.2 From nobody Wed Apr 8 06:45:18 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 07BAEC3A59D for ; Mon, 24 Oct 2022 08:15:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229728AbiJXIPo (ORCPT ); Mon, 24 Oct 2022 04:15:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230225AbiJXIPA (ORCPT ); Mon, 24 Oct 2022 04:15: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 72585D13E for ; Mon, 24 Oct 2022 01:14:48 -0700 (PDT) Received: from ipservice-092-217-079-032.092.217.pools.vodafone-ip.de ([92.217.79.32] 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 1omsbZ-0000nk-UH; Mon, 24 Oct 2022 10:14:41 +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 14/17] staging: r8188eu: remove unnecessary else branch Date: Mon, 24 Oct 2022 10:14:14 +0200 Message-Id: <20221024081417.66441-15-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221024081417.66441-1-martin@kaiser.cx> References: <20221024081417.66441-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 an else branch in OnAuthClient that is not needed. If we go into the else branch, go2asoc is 0. We can simply continue and the last if condition will be false. Signed-off-by: Martin Kaiser Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 01fe5019b333..3c6ea9912d7f 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -850,9 +850,6 @@ static void OnAuthClient(struct adapter *padapter, stru= ct recv_frame *precv_fram go2asoc =3D 1; else return; - } else { - /* this is also illegal */ - return; } =20 if (go2asoc) { --=20 2.30.2 From nobody Wed Apr 8 06:45:18 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 F3A64C3A59D for ; Mon, 24 Oct 2022 08:16:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230291AbiJXIQQ (ORCPT ); Mon, 24 Oct 2022 04:16:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43510 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230226AbiJXIPs (ORCPT ); Mon, 24 Oct 2022 04:15:48 -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 083C82EF16 for ; Mon, 24 Oct 2022 01:14:48 -0700 (PDT) Received: from ipservice-092-217-079-032.092.217.pools.vodafone-ip.de ([92.217.79.32] 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 1omsba-0000nk-QG; Mon, 24 Oct 2022 10:14:42 +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 15/17] staging: r8188eu: remove unnecessary return Date: Mon, 24 Oct 2022 10:14:15 +0200 Message-Id: <20221024081417.66441-16-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221024081417.66441-1-martin@kaiser.cx> References: <20221024081417.66441-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 a return statement at the end of a function. Signed-off-by: Martin Kaiser Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 3c6ea9912d7f..7120e015d1bd 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -852,10 +852,8 @@ static void OnAuthClient(struct adapter *padapter, str= uct recv_frame *precv_fram return; } =20 - if (go2asoc) { + if (go2asoc) start_clnt_assoc(padapter); - return; - } } =20 static void UpdateBrateTbl(u8 *mbrate) --=20 2.30.2 From nobody Wed Apr 8 06:45:18 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 07DA5C3A59D for ; Mon, 24 Oct 2022 08:16:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229850AbiJXIQC (ORCPT ); Mon, 24 Oct 2022 04:16:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41188 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230238AbiJXIPM (ORCPT ); Mon, 24 Oct 2022 04:15:12 -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 9BCE52E9F7 for ; Mon, 24 Oct 2022 01:14:48 -0700 (PDT) Received: from ipservice-092-217-079-032.092.217.pools.vodafone-ip.de ([92.217.79.32] 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 1omsbb-0000nk-Ns; Mon, 24 Oct 2022 10:14:43 +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 16/17] staging: r8188eu: remove an else branch Date: Mon, 24 Oct 2022 10:14:16 +0200 Message-Id: <20221024081417.66441-17-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221024081417.66441-1-martin@kaiser.cx> References: <20221024081417.66441-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" If we go into this else branch, go2asoc is 0. We can continue to the end of the function. The final if condition will be false. Signed-off-by: Martin Kaiser Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 7120e015d1bd..77402e55f640 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -848,8 +848,6 @@ static void OnAuthClient(struct adapter *padapter, stru= ct recv_frame *precv_fram } else if (seq =3D=3D 4) { if (pmlmeinfo->auth_algo =3D=3D dot11AuthAlgrthm_Shared) go2asoc =3D 1; - else - return; } =20 if (go2asoc) --=20 2.30.2 From nobody Wed Apr 8 06:45:18 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 F3C06C38A2D for ; Mon, 24 Oct 2022 08:16:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230070AbiJXIQG (ORCPT ); Mon, 24 Oct 2022 04:16:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230266AbiJXIP0 (ORCPT ); Mon, 24 Oct 2022 04:15: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 5E99F3340A for ; Mon, 24 Oct 2022 01:14:51 -0700 (PDT) Received: from ipservice-092-217-079-032.092.217.pools.vodafone-ip.de ([92.217.79.32] 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 1omsbc-0000nk-US; Mon, 24 Oct 2022 10:14:45 +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 17/17] staging: r8188eu: go2asoc is not needed Date: Mon, 24 Oct 2022 10:14:17 +0200 Message-Id: <20221024081417.66441-18-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221024081417.66441-1-martin@kaiser.cx> References: <20221024081417.66441-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 go2asoc variable in OnAuthClient and call start_clnt_assoc directly. This makes the code a tiny bit shorter. Signed-off-by: Martin Kaiser Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 77402e55f640..ffb708f242e6 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -796,7 +796,6 @@ static void OnAuthClient(struct adapter *padapter, stru= ct recv_frame *precv_fram { unsigned int seq, len, status, offset; unsigned char *p; - unsigned int go2asoc =3D 0; struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo =3D &pmlmeext->mlmext_info; u8 *pframe =3D precv_frame->rx_data; @@ -843,15 +842,12 @@ static void OnAuthClient(struct adapter *padapter, st= ruct recv_frame *precv_fram return; } else { /* open system */ - go2asoc =3D 1; + start_clnt_assoc(padapter); } } else if (seq =3D=3D 4) { if (pmlmeinfo->auth_algo =3D=3D dot11AuthAlgrthm_Shared) - go2asoc =3D 1; + start_clnt_assoc(padapter); } - - if (go2asoc) - start_clnt_assoc(padapter); } =20 static void UpdateBrateTbl(u8 *mbrate) --=20 2.30.2