From patchwork Mon Oct 24 08:14:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 8203 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp317075wru; Mon, 24 Oct 2022 01:17:43 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4tipfr+FhC4JtReYK3HUDKIuzgbd+kQqPRjsIdvFBTg43K/hNrK00BuucnJRUV6a577iFK X-Received: by 2002:a17:907:7294:b0:7a9:8a22:74d4 with SMTP id dt20-20020a170907729400b007a98a2274d4mr1672981ejc.139.1666599463003; Mon, 24 Oct 2022 01:17:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666599462; cv=none; d=google.com; s=arc-20160816; b=OA0a0W8B5fYVptbt8FGEhknj2nCUJT2TPfjkMDPy5Q5SM135bQa1gjFfZAKB2OQXfZ +gk/vuTxhEGVby7iDaVPhXFUOwdvH5HdCKDwFcEtgUOt0Uwlu1SvssrS0GrTqfod0S8i mFjlT4WEJWubeJxg0J8rnCYNQ8U2v1qHKb1Szl24W8TWcqfm1xaUOJs27lcavbF/RY5R n3jgR9puAUhqoYE3L+agCu/i6nZxm+T+ulXPOSfaPlUQkgSzCc51QHIhxX15vf5uEiES XEpFBSL5hNifgVJGyHMyTYRE4Bc0aa9QzrwA83zxNhXwrBC6CiuzSTyUtKzSu+oBcif/ eUzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=Uoh6CKKGIu82x1VriwCuuv2NjP6Fc8ol7msFa6RXj+k=; b=GKC+fwKknqrOQwWJC+VK2pqIRVxYkdtsPPbYwBwBbVNvEFKjv2cDA40fJC5Me7B8Zx qOwgY0iMMkao4I9uSd9aQ7NS4gj3Kn8qOp7hInT48wQMkV260Sp23Zv3jbr2LIIEdW+K I/WPyN9LcgPvTJgB5zOWeLanWcWPCb8nbhx0cVaR8iOSwMLnL6yOlRSfGufz+fm2OPbj GtswNyuyrcefq82Lbo/m5mWtLKY987rkXj5bPteA9PzyPh+JBhJIqFD3Vd2ete0pBP+N xPljJB+VHZ6sWb69SRdGYqwDjQbwzf5IJosM8j04UMq64p8sow4thBCGGKYFcTUrrs3u nfdQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dp20-20020a170906c15400b0078dfe6dc4d2si29164056ejc.33.2022.10.24.01.17.19; Mon, 24 Oct 2022 01:17:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230146AbiJXIOj (ORCPT + 99 others); Mon, 24 Oct 2022 04:14:39 -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 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747556198947731117?= X-GMAIL-MSGID: =?utf-8?q?1747556198947731117?= 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 --- 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" -/* response function for each management frame subtype, do not reorder */ -static mlme_handler mlme_sta_tbl[] = { - OnAssocReq, - OnAssocRsp, - OnAssocReq, - OnAssocRsp, - OnProbeReq, - OnProbeRsp, - NULL, - NULL, - OnBeacon, - NULL, - OnDisassoc, - OnAuthClient, - OnDeAuth, - OnAction, -}; - static u8 null_addr[ETH_ALEN] = {0, 0, 0, 0, 0, 0}; /************************************************** @@ -393,47 +375,6 @@ void free_mlme_ext_priv(struct mlme_ext_priv *pmlmeext) } } -void mgt_dispatcher(struct adapter *padapter, struct recv_frame *precv_frame) -{ - int index; - mlme_handler fct; - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; - struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)precv_frame->rx_data; - struct sta_info *psta = 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 = (le16_to_cpu(hdr->frame_control) & IEEE80211_FCTL_STYPE) >> 4; - if (index >= ARRAY_SIZE(mlme_sta_tbl)) - return; - fct = mlme_sta_tbl[index]; - - if (psta) { - if (ieee80211_has_retry(hdr->frame_control)) { - if (precv_frame->attrib.seq_num == psta->RxMgmtFrameSeqNum) - /* drop the duplicate management frame */ - return; - } - psta->RxMgmtFrameSeqNum = precv_frame->attrib.seq_num; - } - - if (ieee80211_is_auth(hdr->frame_control)) { - if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) - fct = OnAuth; - else - fct = OnAuthClient; - } - - if (fct) - fct(padapter, precv_frame); -} - static u32 p2p_listen_state_process(struct adapter *padapter, unsigned char *da) { bool response = true; @@ -4004,6 +3945,63 @@ struct xmit_frame *alloc_mgtxmitframe(struct xmit_priv *pxmitpriv) return pmgntframe; } +void mgt_dispatcher(struct adapter *padapter, struct recv_frame *precv_frame) +{ + mlme_handler mlme_sta_tbl[] = { + OnAssocReq, + OnAssocRsp, + OnAssocReq, + OnAssocRsp, + OnProbeReq, + OnProbeRsp, + NULL, + NULL, + OnBeacon, + NULL, + OnDisassoc, + OnAuthClient, + OnDeAuth, + OnAction, + }; + int index; + mlme_handler fct; + struct mlme_priv *pmlmepriv = &padapter->mlmepriv; + struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)precv_frame->rx_data; + struct sta_info *psta = 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 = (le16_to_cpu(hdr->frame_control) & IEEE80211_FCTL_STYPE) >> 4; + if (index >= ARRAY_SIZE(mlme_sta_tbl)) + return; + fct = mlme_sta_tbl[index]; + + if (psta) { + if (ieee80211_has_retry(hdr->frame_control)) { + if (precv_frame->attrib.seq_num == psta->RxMgmtFrameSeqNum) + /* drop the duplicate management frame */ + return; + } + psta->RxMgmtFrameSeqNum = precv_frame->attrib.seq_num; + } + + if (ieee80211_is_auth(hdr->frame_control)) { + if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) + fct = OnAuth; + else + fct = OnAuthClient; + } + + if (fct) + fct(padapter, precv_frame); +} + /**************************************************************************** Following are some TX functions for WiFi MLME From patchwork Mon Oct 24 08:14:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 8204 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp317085wru; Mon, 24 Oct 2022 01:17:45 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7FHbki1XhrQ4xjN8jYefP2r1J6PXjFDiGgcOWhQQLYy/kFwIwmu2pZiWqV7BWoegtXV7ln X-Received: by 2002:a05:6402:2b8d:b0:43a:5410:a9fc with SMTP id fj13-20020a0564022b8d00b0043a5410a9fcmr30196399edb.99.1666599465601; Mon, 24 Oct 2022 01:17:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666599465; cv=none; d=google.com; s=arc-20160816; b=TSyi/N2l7BaFmLKezvUFxUo2RV1MTVi7CWJbKB+JZ36n1WkQdFrWfE0/6tRFc5/nVu KEEBvx2tez6m+bpcuQZ7dea8QNaMVklmww4VB3/RwPwdjmrYAdb1MqRH3CIf7o4n/3G2 jJ3Ko/wRpoB/ZPHa56ZasPRKV+HKOGnQTTqlgLMHaV2fqwaCNCOIVDB+bp3dGA7X0X8U WPCGlaZvbhODGwH/bluIVNNrwB6Xso8Vip6C8Dk/TXeo40LG8GXlenOMk60bSQDY9cj9 yWJDBplQfngAKXr36oinbvhApVzcq87+fzdTI/XXk+qiqP+7arONJVi77FBmyokuZkfB +wkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=PuRr9o+eqpxROmeYSsRpbCLVAMEpSbAa/+KHvsWF7zk=; b=Z+I6/B90DJXduVDUzVjO0Wax7rMSjKEUynWFHa2Nc6ECTdteByEOEbB4i1PIgOhbEq LZPQMdzQmhqx/JIm+UzH7iXdG+nlH12EuSk1uIqQ9OQkZLXQBnA/W6hX/3jZTty7ldnZ UP59WMtZbQg/YArqw+qGyUHs+ybW0wf8DO4+EaOTXwOpr54dOIl+Nbww7j3WL55KTQcP OAd52A0fbgyzu2jMGAeLEBpSaMsCXLLlZjeT1zEDJ6KbOm4H/KU6Knifs68YPPnezqeI 5JJ9LzzlaPvHoQ+XZdKb6sIMkwMO5gxyNtetfEOGkrjuSEgI+Jgj85+ozdhFZP2vuy2M LPIA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k5-20020aa7d2c5000000b00461540620f1si7759533edr.169.2022.10.24.01.17.21; Mon, 24 Oct 2022 01:17:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230159AbiJXIOq (ORCPT + 99 others); Mon, 24 Oct 2022 04:14:46 -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 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747556201510287058?= X-GMAIL-MSGID: =?utf-8?q?1747556201510287058?= OnAssocReq is used only in rtw_mlme_ext.c. Make this function static. Signed-off-by: Martin Kaiser --- 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) } } -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/staging/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); -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, From patchwork Mon Oct 24 08:14:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 8214 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp317690wru; Mon, 24 Oct 2022 01:19:49 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5Yg05gfgD1a1z+F1L5xxYxoZtBquH15k1uJ0K0hpAgQh9Cq8RkeM4VJtIZi9ZJZC+VyeID X-Received: by 2002:a17:906:d555:b0:78d:ce55:23af with SMTP id cr21-20020a170906d55500b0078dce5523afmr26051165ejc.524.1666599589770; Mon, 24 Oct 2022 01:19:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666599589; cv=none; d=google.com; s=arc-20160816; b=PE+tgGZN2+l6mhYLhL5y/Qi1RLYOkcC/EF8aspIeHo+vXkiIJWFn7k/lFWhdkZpT2/ S6OSk4KiJy6VerVoAPZIYgowZZJgqxbmcAplHn2gQVN7Xs0RGjJWX1dlCJ64Cu3TpKm8 RvaH/w+MSRirihmQB0x7fCg5QAwh8mMQN1eB+1foLcNtN4KPWSX87pUHOn/jj+rPtYFG ZqhdRhGU1rUJp52mKzC/IY7dNRfY6KYs/OoljVpjfn9gHIP2SjwUKR7WyjFR/U0HGk8b l4EWNQisZqE0hfTnoKZy+hJlFl2nclg92L5ygMHCuBG2uBOiaD8zedCbYkcIuSJu1vrx 7+IQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=sfK12uvoYHrwuIvcCbLtLZNwVsKJq9m+ELMru+0CvlY=; b=Ve3KW6HcLd1M7qDRFLMD0LufGuousrrAvEWq4bYxyLB0SkLjWdkt8232qnyOIyBhXB GxEjWA0qAyijgb9r4qsm1DVo3O9Mz8gMMOJsmvEsRmuw7/Kpml3XcLPYnZC5KL9xTOFh J1Q0UZx0cjkNaonKNOEvfwqzOquUTRv8dShJyJiF3ECJ4P0rnoGq/9MhAu6A3/Pgc3kF qN2W0e8uG5DC1dlL1rPUSFm18WwiE+n/RBKeu9w3eG5LcJqTR99UpwJCpq7oxZDbxUy0 HO2YdyQOX/YONuQ9lFZIAu8C+dcP9ftXRdSfLuuzPgmPI2qmVv4IiMEFCYS4wW0QJtaa lj+g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sc11-20020a1709078a0b00b007303db545e6si26975762ejc.786.2022.10.24.01.19.24; Mon, 24 Oct 2022 01:19:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229494AbiJXIOy (ORCPT + 99 others); Mon, 24 Oct 2022 04:14:54 -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 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747556331345847999?= X-GMAIL-MSGID: =?utf-8?q?1747556331345847999?= OnAssocRsp is used only in rtw_mlme_ext.c. Make this function static. Signed-off-by: Martin Kaiser --- 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 *padapter, struct recv_frame *prec return _FAIL; } -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 = (struct ieee80211_mgmt *)precv_frame->rx_data; uint i; diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/staging/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); -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, From patchwork Mon Oct 24 08:14:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 8213 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp317576wru; Mon, 24 Oct 2022 01:19:22 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7XlZqeaqUC8qr6dtufJ0E3+ZvfwTd2gmUst/q254ImJbrng2+ubwf3p8Zt2wde+rvcuKi3 X-Received: by 2002:a05:6402:5202:b0:461:b7e3:e6b7 with SMTP id s2-20020a056402520200b00461b7e3e6b7mr5047311edd.282.1666599562270; Mon, 24 Oct 2022 01:19:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666599562; cv=none; d=google.com; s=arc-20160816; b=WMH8yPQdwW27wioauRrpm0oSEt9sIjjmvLuFl82GP80oTg6TePtELTv6+33vd6CdqB 3xK5cQgk8PMjHPca4FbdtTZkkgCohaXeKuGK5gLKZbD4jspmXiQ7bkb25RcWWUEpXVIk ZkLOPJd7sVMdU/k0oR8ZAYybMpu7xhd/z0f2CiujDKjjfDLV0JjOIk1h9ex8BjMOrBNb jV26ir7KDAiuK/7NbWE2BR7d2HNWg6xZlkHWO4VPX5Zk+ML1igOn36umDzxNs/KvA4dx 6Z9yXr1ZwlJmf/j2pb0lbeL4z406kxSnGaSUoc92jbTil+dVyySK1X4iD3JWsomCNGQR msxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=jM4qZkS6TgVqeCGVi4CVJ67Nr8Nphn0RLAoHtITAFtQ=; b=ByPiO0HZhEkIo0VxJAgJoJ6dirIqfF4zqlW7lk0wEs6ZmESyJa0SOzzhtH7jnGjy6G rkL7LxES6KOG21673JIbMGkv/AFy5VHFtnb9nO/PYX4W3KVhnApWcNQZyLmnlc7w2yAz 6vDI0NZQc5BK/CveFRvz2duTDf4nDc+kLg1yRjtMvdLnhOtL8HCJNUl5y7W2yyVcBZYU PchN+hr7JshKbwDbhg8bjv42PTNtfSj6S86TDcg+O2tZxdIhzR/1N5Di/vjgcTTL87nU 1Jkj8Pyv6Lyzkh8q69YG7JO+FemNKvTINzkxix1i/dvWFEi6ndgMoQLPq3nJ69YUY1GU mYGA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hs40-20020a1709073ea800b0077cdcd4ed23si29264802ejc.498.2022.10.24.01.18.58; Mon, 24 Oct 2022 01:19:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229967AbiJXIOt (ORCPT + 99 others); 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 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747556302857206873?= X-GMAIL-MSGID: =?utf-8?q?1747556302857206873?= OnProbeReq is used only in rtw_mlme_ext.c. Make this function static. Signed-off-by: Martin Kaiser --- 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 of the management frames *****************************************************************************/ -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/staging/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); -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, From patchwork Mon Oct 24 08:14:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 8216 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp317694wru; Mon, 24 Oct 2022 01:19:50 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7FGGO/yVRt++9wV9mRRQ4XKfSAQVqr/gLT7SVOy/wXIclGEW6t1iohnmPLG12liekc7A+e X-Received: by 2002:a05:6402:2681:b0:461:cbda:fe4b with SMTP id w1-20020a056402268100b00461cbdafe4bmr3015166edd.124.1666599590107; Mon, 24 Oct 2022 01:19:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666599590; cv=none; d=google.com; s=arc-20160816; b=jN4rC4ZZrVIakdxpW0zGAThw+gsc1xO/VsHcWQPcKWCoCwB4BHcDUNBoho0w8y/oe/ DFmBnzoO71j3co7ZE/A672MQKE90uH0Fy7NOKrfdw7trvY8Rhr9whroxg6SDw0QdLP8U /aiYUUO+TZH8v6yU+5bE/GQDk8r7Bh3i8AyigoxcmvQMLCjDJthVfWLH+kjMzwB7xfef xucKCoukydlRI/eqIWXw1QMEKY399NmQ4TrFCMRA6muBNXAbqE/1cv+2h7nTCjBmDIom x0gLtLKpQI9GUye1cnWFeRxQm9dcxbbXZYmoYnNDz0wDymFIpkUXI0PzXX3lnmSOH7kI KDZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=A+3+Nkb2S73gxesacyUbEdFYiJN6I3Wp35yTFyJaVTo=; b=OZ1ZE0OaTzdM47XlijSv8LkVmhR+YVHUfk4sdeqBGe9v1VFTo4d0pF8Mc8IKwhEVFV p7QBb7CBqQzOwQAwH1vpeKtuyamoHLfKWoFo40abIDGTmdDdAuVr1gy/AOggb0hfuTSG gLxtL5Y+yAnhvyrwv9coByUdYUh6FOBrPYry5iWS0z/jq3q3hkAUq62FbWIyd8pd3rd7 wK8Bgu4efDB5gMSQPHcbXMiilFmqcpLbtWjPN+o+SYuZN3pOeKXLIIcr/EssVv50YUgw 6CNdL55MWE2vbvKtt+CbegttKmGX5yVpES9ddKEGO+P+4qORA+J2hWm5iBQp3f2Ml0hX CFzA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i5-20020a17090671c500b0073dd7598686si23020833ejk.270.2022.10.24.01.19.24; Mon, 24 Oct 2022 01:19:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230203AbiJXIPC (ORCPT + 99 others); Mon, 24 Oct 2022 04:15:02 -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 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747556331934411250?= X-GMAIL-MSGID: =?utf-8?q?1747556331934411250?= OnProbeRsp is used only in rtw_mlme_ext.c. Make this function static. Signed-off-by: Martin Kaiser --- 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; } -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 = &padapter->mlmeextpriv; struct wifidirect_info *pwdinfo = &padapter->wdinfo; diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/staging/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); -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, From patchwork Mon Oct 24 08:14:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 8215 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp317691wru; Mon, 24 Oct 2022 01:19:49 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6oGg5nnPBDM4lhc+UPCaxn8Bn7JAVv61Sw57Q+gXfkVCB4zAK1g++q2EDM/EYsvlpTtr1l X-Received: by 2002:a17:906:8470:b0:78d:b531:7d10 with SMTP id hx16-20020a170906847000b0078db5317d10mr26799039ejc.275.1666599589753; Mon, 24 Oct 2022 01:19:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666599589; cv=none; d=google.com; s=arc-20160816; b=UkIfYWaHflu8M9ffNE0de0tyLdx4nqA3N3SMIC2rHg1z5EdeqU7ALAVvs1jn7hwR9v sBSEv46Q1Kb01KAI38T1qmOCZTwpsaVQR03tWNaWxyuR8Imcz3Tut9L44mwo3eOXYoj0 Sngegb6QZBAXpfhPW2binZhhGaTSZj6PnJ2H6KGKSMuBYSWJJuWiYu+QGdOGGyr41FIO VX4i+i8+emptl5QJKok3cmV9sA0naSOUfGXDmusxaJ3kC7+tg9y0SOXarGTkTpsdZQ6w tsNow2e8DOlYjcES7Fg6lodFiTAcXH5exINXnal+CbOERYj1rTmoRO77M7qd/XTkNjkm k57g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=xH7Ewj7K8iCrTeiEr/tpbxPvjLpLc5UUHdyA8m7Ry48=; b=fEw8wf0R6KW/VauSZ6phcohKABBQWj/RMoPpT2djZZKLhhwS37IPGRYKDnSjPe80pa 0Xd6QHFMSH6b7B+FLs8lJyRqfpwnY+P/iJM0X+r/bRxaZbcok5EKYl1cBzOixfZMQlA5 QUgVYh57ELdYPX0rYPnmmrmbjsNuhtqzwyYeQNKN1AV90RC5l/A5QQbvmqLWkW3tfQk8 xVhwQZv6UCxvMH2VOiQGeRIbHGO/t+aOYeB5nZtXUbbtyUyH/bs8c6VUrPd9FXOjCWyn vSSZc1V82wj5kezaRyMzST1jiTJ3hDM3KJGcCS5wmFsSJYOImUxefkoXb/m2hPooNQNy Z1ag== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id go33-20020a1709070da100b007a8beb3aa4csi1947924ejc.872.2022.10.24.01.19.24; Mon, 24 Oct 2022 01:19:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229845AbiJXIPG (ORCPT + 99 others); Mon, 24 Oct 2022 04:15:06 -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 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747556331052387655?= X-GMAIL-MSGID: =?utf-8?q?1747556331052387655?= OnBeacon is used only in rtw_mlme_ext.c. Make this function static. Signed-off-by: Martin Kaiser --- 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; } -unsigned int OnBeacon(struct adapter *padapter, struct recv_frame *precv_frame) +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/staging/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); -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, From patchwork Mon Oct 24 08:14:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 8205 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp317294wru; Mon, 24 Oct 2022 01:18:31 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4olpuaALhvCiO5qgpRxjF4ODmxqrsde4PxfzvE9fzlh71s75YTwdupqMR0F3l32SWDqIOu X-Received: by 2002:a17:906:8451:b0:79d:af69:8a20 with SMTP id e17-20020a170906845100b0079daf698a20mr12018838ejy.406.1666599511025; Mon, 24 Oct 2022 01:18:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666599511; cv=none; d=google.com; s=arc-20160816; b=Tw9wMXRCWN3uEiweNLTEM5vx//dSQi8mfKZHsi4zy7P+j3q1F1yqzW9vb8WPmQ498u IVgfMnbT1BDq+Dgavy+n5rXH4N73ZFH9acDfrmdWkf5Vrd87f9ZWr7GSpv7Sj1Wx99b6 TftqU6zRGOihm7VRJQxGoRyZCGyKn7eJYGu4bCRMP4f2965SiGjHt7rpkQArNKENwBGL vdzs8rKk/8U9t7WW49Psq11wpuxRWbK94zsqjpy5m4T0mhlvdayNl10U13yFZtezL4aY tzIz9CYPnr9h80WW5dgJo4M8IuoWwIpMcsBiU9MWmbtiPAxK543b0l5YvA9S66M8B5VZ xcPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=RHbZ1/pSiq7pnlArYB2J0eeZwhgcP4taNbEADuy5E90=; b=ltWpKl8BzLhp8Rw8pK7DRY11Fptqw3Qs6sVYeGM7+5FfN/LbwdqmYIAew7oaK2O9Nv sB9mcLMQVipD5ZztN1tt3LQC5wecw9w2xNZ3l6IY0k7pZwrI73x/tU7B1L/Ggcq5NR+7 RVvsaWUgEORdXCrEZm9x7V9gzD8kTt4MNg1R5JMsc1dnYqKMhZpi+ckr+NymJ87u/aKn 94FpFl34s2P3XT5PIQkwE4hOm5Y7uxKUC4cPWVQpZS2W4RkS/s/5ndM3+zGl1ZrhwOva p4eSb4Am5TwmobtjJihbc8Athd+LTsW0tEUPEh+dX9i1Y/lKaygqowjdtoKyq3Sl1RST 0vMA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hv11-20020a17090760cb00b00780f0b45416si31411962ejc.622.2022.10.24.01.18.07; Mon, 24 Oct 2022 01:18:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230234AbiJXIPL (ORCPT + 99 others); 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 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747556248819797988?= X-GMAIL-MSGID: =?utf-8?q?1747556248819797988?= OnDisassoc is used only in rtw_mlme_ext.c. Make this function static. Signed-off-by: Martin Kaiser --- 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, struct recv_frame *precv_frame) return _SUCCESS; } -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 = &padapter->mlmepriv; diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/staging/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); -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, From patchwork Mon Oct 24 08:14:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 8217 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp317695wru; Mon, 24 Oct 2022 01:19:50 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7YYSGXQewab5X+qU2mIGiPJjlHAgZAzXr1Va6BXuMcXRi6QX8mp331DZfAltP9FsolpFBb X-Received: by 2002:aa7:c0cf:0:b0:45c:6a06:ea9a with SMTP id j15-20020aa7c0cf000000b0045c6a06ea9amr29263371edp.211.1666599590078; Mon, 24 Oct 2022 01:19:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666599590; cv=none; d=google.com; s=arc-20160816; b=oWuBqI82vfUi9NYFneiDmiwv+dAcHNhP4BRylVm1hCxxaFQmzhxMnJGpoLzggrtkEy lT8llTjG9zNX1nihOQ7oQxh1vCoG/IHbx9pldpD2dw3LwQdOr2vAPiqj/QEiOQQoDtFf 5pdSZyY2Qcoq8AuYW5Me1bcxQeex+VAertr6Q7YBareVqdejzIFY3uUianWy5x6nJSdK jaHows+9PMbBpn5cLGMbfdx54VY7UQQ5j5+8Ogu0YuhqxQUiOvnCmXbw60XiwLsECyb5 g4IhMNgDqqsXj/8SnFqHsQ1J4swx910c49hv0aTQMYhcIvEmYE6qqPCyR3wCBEitjmPn v6iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=FAkp76vVzNsLzYs6ppHvN9KPBAGvmmPpIQF4czLkzuc=; b=H3mzuaaJ2nIfR8NMXFtONa0Dz1GhaXSH4j43eeQxYYnZ+ANySIQkcBzmUzxq3GuYCT ybFNeuUz1P0WskLTmMoqiqRrKGrf6AOljqMPXikBPmHaiusn9tLuaaOwGvGSDJqU5oCt y9krvOolyDY1AA/jcJop3kAlOfD2uhBHxRZFoB9t9PiVGc0WLINuEcYlbIuRHQL9QCS+ JNbr/NYd/StxSp02l0j70rixrX5q0b733YI+gRKY4vVu6C4OVKmeVpecLtXxRKVWeTvU Tb9DXcy8phx3H7JzsrdEphXZvthd0HWjlmmhukN497tmKWw0U2lk9bOcCCB3MVltxDv2 51gg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sc39-20020a1709078a2700b007aa5e6c4b5bsi512158ejc.164.2022.10.24.01.19.25; Mon, 24 Oct 2022 01:19:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230245AbiJXIPO (ORCPT + 99 others); Mon, 24 Oct 2022 04:15:14 -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 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747556331882066390?= X-GMAIL-MSGID: =?utf-8?q?1747556331882066390?= OnAuthClient is used only in rtw_mlme_ext.c. Make this function static. Signed-off-by: Martin Kaiser --- 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 recv_frame *precv_frame) return _FAIL; } -unsigned int OnAuthClient(struct adapter *padapter, struct recv_frame *precv_frame) +static unsigned int OnAuthClient(struct adapter *padapter, struct recv_frame *precv_frame) { unsigned int seq, len, status, offset; unsigned char *p; diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/staging/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); 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, From patchwork Mon Oct 24 08:14:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 8207 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp317355wru; Mon, 24 Oct 2022 01:18:42 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4JWCLTyWdgwH/iZfFKjyOg95WOu5oOoqhlNw3cOU1yIXmPpgPyWworVbvBwi+UqU2OlrMl X-Received: by 2002:a17:907:78d:b0:740:33e1:998 with SMTP id xd13-20020a170907078d00b0074033e10998mr26990015ejb.162.1666599522534; Mon, 24 Oct 2022 01:18:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666599522; cv=none; d=google.com; s=arc-20160816; b=HSe7sY7K2cAILtHK87c5+nnBcMH0WZIa1NOODPhdChvvuKki4rn8ufSvKcQGVyOnv0 FT11/cVIU2hjkNybQJYdrlpwZmYl80Hhx0xZhtapXTsPyQ67wf5gxGK7eFdhQKRGQLUG mA+p8pV1TEfnJ3i8UQSjeUZdvZSDGer1+9KK9GC7jVe7g2RQoiXnbQd1zcgCsoFHY3zG ct9UzNRFKNedZfvRqTz3BfjsVGsy4bxza6scEfBK0c5mxkMt6K+EyZoT/GG5AMVTWTFu MX0OahMiTNMi081MGtbF5BLrmtR0rPvZz8IvcgVwe71ar5JHembLfDpyW8xk2uO3C5IP e5wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=7EQ5FdIcpY052dwWuNKHn7VP0IcjKzQ0K3K4t/6bwf0=; b=hL8P1P4UYz4yaIqhB1XTerse67JL2Q0PaJVqiQwIrbQI65oRS5f+PRLQvfZITGlJLb lkS0qh+RGHJax+ajWceYUZAOTmatdRw5iYwMDEh1wiePXVZf/Q/Q4HvAU8eWyKYz73oP IIbTzlLtEEActPvkDrahrAiCxt/EN3N3Z2s+7TgclACkxNkOWXyhTcxH1dd+b3cjAGXn wHh/Zu8FbwzdPGx0/c47vTSOdHwcAcsIh23HzOPSRiUQloqGjAsv4kh6eHXxS9wj6OOq j0vWFFGOLUThhRh4E2FAg8nG5cBJidyIk8QjeFGnciaLEGdfIq+PPvfUFQC/6Nx13jOl rs6g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id br13-20020a170906d14d00b007a46fa50b26si3614939ejb.517.2022.10.24.01.18.18; Mon, 24 Oct 2022 01:18:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230220AbiJXIP0 (ORCPT + 99 others); Mon, 24 Oct 2022 04:15:26 -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 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747556260787462425?= X-GMAIL-MSGID: =?utf-8?q?1747556260787462425?= OnDeAuth is used only in rtw_mlme_ext.c. Make this function static. Signed-off-by: Martin Kaiser --- 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 *padapter, struct recv_frame *prec return _SUCCESS; } -unsigned int OnDeAuth(struct adapter *padapter, struct recv_frame *precv_frame) +static unsigned int OnDeAuth(struct adapter *padapter, struct recv_frame *precv_frame) { struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)precv_frame->rx_data; unsigned short reason; diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/staging/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); 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); From patchwork Mon Oct 24 08:14:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 8220 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp318074wru; Mon, 24 Oct 2022 01:20:57 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7E1YqsjW31ZfN1K0aAKQlNwDFdU6RReCr6Sq3Mwj/p+47CqzM52RL9lvwnN7o8lv8sE94J X-Received: by 2002:a05:6402:1ccd:b0:459:aa70:9e12 with SMTP id ds13-20020a0564021ccd00b00459aa709e12mr29589297edb.206.1666599657650; Mon, 24 Oct 2022 01:20:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666599657; cv=none; d=google.com; s=arc-20160816; b=mUijY21szJ1Sn+6STRuUQ9+dqkeoYSd32uQ/4mw8XiwhY3nQRkX/HP6lSFfcINtbPH uqlGF5kJfmAVFjBMpKU0DWyK0VIB/Y8BfJaWSnaY8QcBXJFhgpIgZz397ri2R0B4LNyv oTCYO2pufGW/Khx7orosfcU35Q+oQ3rTyjvN0SRm3yMwGMiZ4KT8/B0EptRK2Mr1UFgL DrjawGCrrms1o2PKnlw9Pc0o2Or6LspYSzWjzQOsyKYBm6jws531FGcN+5IT1qCF3IIS pL8YxIAOiB3FIRw5u1EM91bqdAEnVooidrlmRSe4yB4RlHSObqrO5K7rBjL2Ql+NlgeO LEvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=9QcN6OwUNoY4DnfdHuiyMgQmXUmmSZqxkKjEBx/+8Jc=; b=tSJJZ2OxsTrjaFsLqxzahfDrXLV0S0Uppti8didrpU/rvYenxlrZFutYrJAv98AFC8 /35H1E6U0VZCcSPl9XPmjaQUD5dWw5rqwdv+pvv7y4K0MO9qYkgK6kdd2UJyaZ/cMOOm 3tPK4jpTN3AIfWUVbvbunOIqApAPJwwRjrmr0vCRXny/JokS8FEt+GugzK87c1KuybY7 a59+GCt8i5kdxoOQAqNSWA9X2rQ2Y929pvMmDH2uot7Wr6TfrcpdfMdjH3pfvaARt6+Z VFOxHFE9/ZN7XV2ZJkWPxNt58g94n56ZJNsYxs6ciOnlpyHr4XEkNGQ64uZyv1XYU/8V 5+kw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ji20-20020a170907981400b007820e1a4302si12930038ejc.675.2022.10.24.01.20.33; Mon, 24 Oct 2022 01:20:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230274AbiJXIPh (ORCPT + 99 others); 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 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747556402968427362?= X-GMAIL-MSGID: =?utf-8?q?1747556402968427362?= OnAction is used only in rtw_mlme_ext.c. Make this function static. Signed-off-by: Martin Kaiser --- 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, struct recv_frame *precv_fra return _SUCCESS; } -unsigned int OnAction(struct adapter *padapter, struct recv_frame *precv_frame) +static unsigned int OnAction(struct adapter *padapter, struct recv_frame *precv_frame) { struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)precv_frame->rx_data; diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/staging/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); unsigned int OnAuth(struct adapter *padapter, struct recv_frame *precv_frame); -unsigned int OnAction(struct adapter *padapter, - struct recv_frame *precv_frame); unsigned int OnAction_back(struct adapter *padapter, struct recv_frame *precv_frame); From patchwork Mon Oct 24 08:14:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 8209 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp317444wru; Mon, 24 Oct 2022 01:18:59 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7zq0yLGRiuvL5PbF/CXvGhIS4UZcDTjL3WxcCMHzVJZNJBVym+Z2mO0OjfB3nngS5CfAup X-Received: by 2002:a17:906:db02:b0:780:24e:cf9 with SMTP id xj2-20020a170906db0200b00780024e0cf9mr26674308ejb.460.1666599539593; Mon, 24 Oct 2022 01:18:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666599539; cv=none; d=google.com; s=arc-20160816; b=DJdIYIYDdQHfDV8mAb1G7mLCGPxwhXk45gG+YPKYwlUwaeHjsUenMdDjLq9RVqkmzx B1rStSEitus3DiODEDLR5MZ1SF0GvKTOjUgWo63ohv8n242S9F2yH4OLnZPz23jS1+a/ 6LGrPapUr9+k8VDH/lbdytDby99UWphzRjoAy2P0dGh1Pd+QcbF4HB41bIoCm2toVDhy kYOm3/tL5aOBkZlN+81LBDcS8ZIiY/5QWfRtHR64B7l8G8JJ55vT7vHZBPpL+HCmgOMO x9Jkzpox7XwjUUu+xIr9ZnljanYsVa4e2tpnciyr0kPb9aKXpvw5jrPni6QUy38gXWKi +ZfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=qmV2meQym8sG4tVFK0NYmAdCJSxNDDZK4OVfc4Mxsbs=; b=K9a7JehHPQQXZhftXr43SSCmxMDj1jHXse25qh4gmwTpel5daXTQmrRObx3huK4nP7 4U08AsKbqZ32ejlSbZ6w1Gk5pYroc29di/LufExYTX464PXYmxc+kB07x1InCJY93jFB Z4cE7qaBsbsuRyJGDOBdGXNkEf5KToCiOb2iOn1f1mb60HbsIsOQllkBZ17/YK4AFOfy fNKWdT99pKI0W7UQ+vL95P17pe8iD0xHIseFEHCiLgKUrEwaG/8cvY1B++ZbB+Gvg1bX T3pgj2WmnLctWtYeDwZprUbBTpuf4obStnU7A3LYpmsxT+LNJvWskN+rJ8f18G9mCUqm C3zA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hc40-20020a17090716a800b007a7d37e4683si2557607ejc.862.2022.10.24.01.18.36; Mon, 24 Oct 2022 01:18:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230270AbiJXIPb (ORCPT + 99 others); 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 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747556278769310878?= X-GMAIL-MSGID: =?utf-8?q?1747556278769310878?= OnAuth is used only in rtw_mlme_ext.c. Make this function static. Signed-off-by: Martin Kaiser --- 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; } -unsigned int OnAuth(struct adapter *padapter, struct recv_frame *precv_frame) +static unsigned int OnAuth(struct adapter *padapter, struct recv_frame *precv_frame) { unsigned int auth_mode, ie_len; u16 seq; diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/staging/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); -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, From patchwork Mon Oct 24 08:14:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 8210 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp317471wru; Mon, 24 Oct 2022 01:19:02 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6Gfn2DJxvk3aFsmK+xw3sGcbnFvbQ7VD41hb1fZuA+KEW5bgZVcMzJ/Z06kX8jQbqjEkDG X-Received: by 2002:a17:907:271b:b0:7a4:9b4f:b641 with SMTP id w27-20020a170907271b00b007a49b4fb641mr6106363ejk.679.1666599542655; Mon, 24 Oct 2022 01:19:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666599542; cv=none; d=google.com; s=arc-20160816; b=Tk/VcMVKXsQCM1uGONnkuEWF5F0/j1F0a5n7qF8bXy+Lx9qXfHvI5G9ZVF1cl+NUmJ H2i+p9j/N+BPjfQw/xjQECJ1sM3GucA4ujah/zXTvT6hgSbvS5BllatsACfsfXLj9HHC 4P8HABQf+lifRiV3PEp3EORPvBPyBGGWdF2/BKBxKn0acmk6+d9wLiB056oShJssZTOc 2B6yDx+kB1C8e1f6wFWfsVzWfiB4wlR98kq9ZEuNKPAFpPbdtgEET2bk1lqP5sZA3qOz WXayCaG1Fvk5uz03yt8g5dms65J02NQSaEi9nqKMBZyJ1llWhnQ7jjgENoEtj7wbgqgk EPEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=jQ0k5vuRoba7vq/kYSADdqiHTE99qg51Aom1KQW0pH0=; b=Gx9eFYTA2hDwZk1O4jgHgy2N8MfVtsfgj7HZohgmbPfMUgiec14MPh6TSWk0YOXopp APEBdisSMyYObNcfZmgpGmhjoxJBGjoNZZg79coT32ifuG2Edqib3bgQ25e1wjwFn/Nb JKMMLh2ehRn9iANBoLmRPMjpTl2oFlbz1NDnVlHkpvL+WIYz3zGaxV7oNtiZYiiKjqJS NiK9ypfhnqv4S6tStwug+ToP/Ov3E8fra19Dj4I4pxKIGIO4kbT/GicB1DBo8LDXBZaz UB6oZ06vo3AnyRHhT+fuvjbEun783LSjOhUkBDaaNgd3Aw/0HRJ7IrUNgbgQ/5V61b6w 9TAQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c15-20020a05640227cf00b0045eec876883si16746048ede.229.2022.10.24.01.18.39; Mon, 24 Oct 2022 01:19:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229865AbiJXIPe (ORCPT + 99 others); Mon, 24 Oct 2022 04:15:34 -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 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747556281888975539?= X-GMAIL-MSGID: =?utf-8?q?1747556281888975539?= 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 --- 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 of the management frames *****************************************************************************/ -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 *padapter, struct recv_frame *prec report_survey_event(padapter, precv_frame); p2p_listen_state_process(padapter, get_sa(pframe)); - return _SUCCESS; + return; } } } if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) - return _SUCCESS; + return; if (!check_fwstate(pmlmepriv, _FW_LINKED) && !check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE | WIFI_AP_STATE)) - return _SUCCESS; + return; p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + _PROBEREQ_IE_OFFSET_, _SSID_IE_, (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 if ((ielen != 0 && memcmp((void *)(p + 2), (void *)cur->Ssid.Ssid, cur->Ssid.SsidLength)) || (ielen == 0 && pmlmeinfo->hidden_ssid_mode)) - return _SUCCESS; + return; _issue_probersp: @@ -512,10 +512,9 @@ static unsigned int OnProbeReq(struct adapter *padapter, struct recv_frame *prec check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE))) issue_probersp(padapter, get_sa(pframe), is_valid_p2p_probereq); } - return _SUCCESS; } -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 = &padapter->mlmeextpriv; struct wifidirect_info *pwdinfo = &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), ETH_ALEN)) { @@ -555,13 +554,11 @@ static unsigned int OnProbeRsp(struct adapter *padapter, struct recv_frame *prec } if (pmlmeext->sitesurvey_res.state == SCAN_PROCESS) { report_survey_event(padapter, precv_frame); - return _SUCCESS; + return; } - - return _SUCCESS; } -static unsigned int OnBeacon(struct adapter *padapter, struct recv_frame *precv_frame) +static void OnBeacon(struct adapter *padapter, struct recv_frame *precv_frame) { int cam_idx; struct sta_info *psta; @@ -576,7 +573,7 @@ static unsigned int OnBeacon(struct adapter *padapter, struct recv_frame *precv_ if (pmlmeext->sitesurvey_res.state == SCAN_PROCESS) { report_survey_event(padapter, precv_frame); - return _SUCCESS; + return; } if (!memcmp(GetAddr3Ptr(pframe), get_my_bssid(&pmlmeinfo->network), ETH_ALEN)) { @@ -600,7 +597,7 @@ static unsigned int OnBeacon(struct adapter *padapter, struct recv_frame *precv_ /* start auth */ start_clnt_auth(padapter); - return _SUCCESS; + return; } if (((pmlmeinfo->state & 0x03) == WIFI_FW_STATION_STATE) && (pmlmeinfo->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 received */ @@ -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 = allocate_fw_sta_entry(padapter); if (cam_idx == NUM_STA) - goto _END_ONBEACON_; + return; /* get supported rate */ if (update_sta_support_rate(padapter, (pframe + WLAN_HDR_A3_LEN + _BEACON_IE_OFFSET_), (len - WLAN_HDR_A3_LEN - _BEACON_IE_OFFSET_), cam_idx) == _FAIL) { pmlmeinfo->FW_sta_info[cam_idx].status = 0; - goto _END_ONBEACON_; + return; } /* update TSF Value */ @@ -645,13 +642,9 @@ static unsigned int OnBeacon(struct adapter *padapter, struct recv_frame *precv_ } } } - -_END_ONBEACON_: - - return _SUCCESS; } -static unsigned int OnAuth(struct adapter *padapter, struct recv_frame *precv_frame) +static void OnAuth(struct adapter *padapter, struct recv_frame *precv_frame) { unsigned int auth_mode, ie_len; u16 seq; @@ -668,7 +661,7 @@ static unsigned int OnAuth(struct adapter *padapter, struct recv_frame *precv_fr uint len = precv_frame->len; if ((pmlmeinfo->state & 0x03) != WIFI_FW_AP_STATE) - return _FAIL; + return; sa = GetAddr2Ptr(pframe); @@ -784,7 +777,7 @@ static unsigned int OnAuth(struct adapter *padapter, struct recv_frame *precv_fr if (pstat->state & WIFI_FW_AUTH_SUCCESS) pstat->auth_seq = 0; - return _SUCCESS; + return; auth_fail: @@ -797,10 +790,9 @@ static unsigned int OnAuth(struct adapter *padapter, struct recv_frame *precv_fr memcpy(pstat->hwaddr, sa, 6); issue_auth(padapter, pstat, (unsigned short)status); - return _FAIL; } -static unsigned int OnAuthClient(struct adapter *padapter, struct recv_frame *precv_frame) +static void OnAuthClient(struct adapter *padapter, struct recv_frame *precv_frame) { unsigned int seq, len, status, offset; unsigned char *p; @@ -812,10 +804,10 @@ static unsigned int OnAuthClient(struct adapter *padapter, struct recv_frame *pr /* check A1 matches or not */ if (memcmp(myid(&padapter->eeprompriv), get_da(pframe), ETH_ALEN)) - return _SUCCESS; + return; if (!(pmlmeinfo->state & WIFI_FW_AUTH_STATE)) - return _SUCCESS; + return; offset = (GetPrivacy(pframe)) ? 4 : 0; @@ -848,7 +840,7 @@ static unsigned int OnAuthClient(struct adapter *padapter, struct recv_frame *pr issue_auth(padapter, NULL, 0); set_link_timer(pmlmeext, REAUTH_TO); - return _SUCCESS; + return; } else { /* open system */ go2asoc = 1; @@ -865,10 +857,10 @@ static unsigned int OnAuthClient(struct adapter *padapter, struct recv_frame *pr if (go2asoc) { start_clnt_assoc(padapter); - return _SUCCESS; + return; } authclnt_fail: - return _FAIL; + return; } static void UpdateBrateTbl(u8 *mbrate) @@ -911,7 +903,7 @@ static void UpdateBrateTblForSoftAP(u8 *bssrateset, u32 bssratelen) } } -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 = 0; if ((pmlmeinfo->state & 0x03) != WIFI_FW_AP_STATE) - return _FAIL; + return; frame_type = GetFrameSubType(pframe); if (frame_type == WIFI_ASSOCREQ) @@ -946,7 +938,7 @@ static unsigned int OnAssocReq(struct adapter *padapter, struct recv_frame *prec ie_offset = _REASOCREQ_IE_OFFSET_; if (pkt_len < IEEE80211_3ADDR_LEN + ie_offset) - return _FAIL; + return; pstat = rtw_get_stainfo(pstapriv, GetAddr2Ptr(pframe)); if (pstat == (struct sta_info *)NULL) { @@ -1300,13 +1292,13 @@ static unsigned int OnAssocReq(struct adapter *padapter, struct recv_frame *prec report_add_sta_event(padapter, pstat->hwaddr, pstat->aid); } - return _SUCCESS; + return; asoc_class2_error: issue_deauth(padapter, (void *)GetAddr2Ptr(pframe), status); - return _FAIL; + return; OnAssocReqFail: @@ -1316,10 +1308,10 @@ static unsigned int OnAssocReq(struct adapter *padapter, struct recv_frame *prec else issue_asocrsp(padapter, status, pstat, WIFI_REASSOCRSP); - return _FAIL; + return; } -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 = (struct ieee80211_mgmt *)precv_frame->rx_data; uint i; @@ -1333,13 +1325,13 @@ static unsigned int OnAssocRsp(struct adapter *padapter, struct recv_frame *prec /* check A1 matches or not */ if (memcmp(myid(&padapter->eeprompriv), mgmt->da, ETH_ALEN)) - return _SUCCESS; + return; if (!(pmlmeinfo->state & (WIFI_FW_AUTH_SUCCESS | WIFI_FW_ASSOC_STATE))) - return _SUCCESS; + return; if (pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) - return _SUCCESS; + return; _cancel_timer_ex(&pmlmeext->link_timer); @@ -1392,11 +1384,9 @@ static unsigned int OnAssocRsp(struct adapter *padapter, struct recv_frame *prec report_assoc_result: report_join_res(padapter, res); - - return _SUCCESS; } -static unsigned int OnDeAuth(struct adapter *padapter, struct recv_frame *precv_frame) +static void OnDeAuth(struct adapter *padapter, struct recv_frame *precv_frame) { struct ieee80211_mgmt *mgmt = (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 = &padapter->wdinfo; if (memcmp(mgmt->bssid, get_my_bssid(&pmlmeinfo->network), ETH_ALEN)) - return _SUCCESS; + return; 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_ psta = rtw_get_stainfo(pstapriv, mgmt->sa); if (!psta) - return _SUCCESS; + return; spin_lock_bh(&pstapriv->asoc_list_lock); if (!list_empty(&psta->asoc_list)) { @@ -1455,10 +1445,9 @@ static unsigned int OnDeAuth(struct adapter *padapter, struct recv_frame *precv_ pmlmepriv->LinkDetectInfo.bBusyTraffic = false; } - return _SUCCESS; } -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 = &padapter->mlmepriv; @@ -1469,7 +1458,7 @@ static unsigned int OnDisassoc(struct adapter *padapter, struct recv_frame *prec /* check A3 */ if (!(!memcmp(GetAddr3Ptr(pframe), get_my_bssid(&pmlmeinfo->network), ETH_ALEN))) - return _SUCCESS; + return; 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 *padapter, struct recv_frame *prec associated_clients_update(padapter, updated); } - return _SUCCESS; + return; } else { receive_disconnect(padapter, GetAddr3Ptr(pframe), reason); } pmlmepriv->LinkDetectInfo.bBusyTraffic = false; - return _SUCCESS; } unsigned int OnAction_back(struct adapter *padapter, struct recv_frame *precv_frame) @@ -3906,7 +3894,7 @@ unsigned int OnAction_p2p(struct adapter *padapter, struct recv_frame *precv_fra return _SUCCESS; } -static unsigned int OnAction(struct adapter *padapter, struct recv_frame *precv_frame) +static void OnAction(struct adapter *padapter, struct recv_frame *precv_frame) { struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)precv_frame->rx_data; @@ -3921,7 +3909,6 @@ static unsigned int OnAction(struct adapter *padapter, struct recv_frame *precv_ OnAction_p2p(padapter, precv_frame); break; } - return _SUCCESS; } struct xmit_frame *alloc_mgtxmitframe(struct xmit_priv *pxmitpriv) diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/staging/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, }; -typedef unsigned int (*mlme_handler)(struct adapter *adapt, struct recv_frame *frame); +typedef void (*mlme_handler)(struct adapter *adapt, struct recv_frame *frame); struct ss_res { int state; From patchwork Mon Oct 24 08:14:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 8206 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp317345wru; Mon, 24 Oct 2022 01:18:41 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6lgIhw695YYVN/eQNnO9JHxDTgdNoNcguQzWGkYe0079L9+bxgqzKSXjq/GsRJM7j6Tq+B X-Received: by 2002:a05:6402:501a:b0:457:f093:cadb with SMTP id p26-20020a056402501a00b00457f093cadbmr29115750eda.143.1666599521057; Mon, 24 Oct 2022 01:18:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666599521; cv=none; d=google.com; s=arc-20160816; b=xu2QbAbg3VYxrrjz9hURJtbr7VadrXquGolp9GDdtH4L6MuO1Ec2QMoXRGU0ThmvVk 85kWxQiv20cYLQVHjFxDGYEW3ta+paGO3gA3aOiqW0a0qSpHqj7735b/Vjw+FmO2yDW1 +NNKXm0XNtzSBO1RXKJQ5KoMQ0px0CtGOqEVpTTtvMux18JI1zzSKDiiswSod24XcKs3 sSpKFUdw5bKAvYhm7aY07GovFQPYDQTQQDUOLp4fJmpbsX1GafXhxXp5h20excTRw3kN J884tCaO73L/Eq6h3c2sEnbot61rdJEWSbHoVxsUyDqfNHs43iw/Ww6zNTeTelj7WAQo T/XA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=uCQHSYNh6hjZ0Z6a+rCPVOzyXZS0ejUWFFIYjJMzpSM=; b=PeKCWTiDOif0nZ6x0HlRiM7EQgatNqVF3utKOM8IdA0CbQ9Q/JYltJmu3myX9WrYRN zgCWUzoB8AJ0ua/UB6r+sJ0AveYUsEEIEP4Ugit2c6287bKHmMJKV5QVIZlQZfsgdV7b N64BxTm7ULJJvQoeIqfcVuleo/KxSOS5XjaDZPSjDQhsxYr6vGfgMqwhijfa03pUShUZ rM8Z28SjfF/d2Q/7uXrCVJwqybmPMaWTQSs47mRmjLWq8dRDzTCWOkuqtccNgIJ2IcTr ZkLhG1aP96yej0701lzZ8JWNuvYLUsO25u8tbioqf8Tu0XeIkxikTrdFEHo5VoDUG22i n7HA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g19-20020a056402181300b00461d02225a3si1485032edy.448.2022.10.24.01.18.16; Mon, 24 Oct 2022 01:18:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230255AbiJXIPU (ORCPT + 99 others); Mon, 24 Oct 2022 04:15:20 -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 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747556259103671851?= X-GMAIL-MSGID: =?utf-8?q?1747556259103671851?= Remove a label on OnAuthClient that just calls return. We can return directly instead of jumping to this label. Signed-off-by: Martin Kaiser --- 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, struct recv_frame *precv_fram } set_link_timer(pmlmeext, 1); - goto authclnt_fail; + return; } if (seq == 2) { @@ -833,7 +833,7 @@ static void OnAuthClient(struct adapter *padapter, struct recv_frame *precv_fram pkt_len - WLAN_HDR_A3_LEN - _AUTH_IE_OFFSET_); if (!p) - goto authclnt_fail; + return; memcpy((void *)(pmlmeinfo->chg_txt), (void *)(p + 2), len); pmlmeinfo->auth_seq = 3; @@ -849,18 +849,16 @@ static void OnAuthClient(struct adapter *padapter, struct recv_frame *precv_fram if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) go2asoc = 1; else - goto authclnt_fail; + return; } else { /* this is also illegal */ - goto authclnt_fail; + return; } if (go2asoc) { start_clnt_assoc(padapter); return; } -authclnt_fail: - return; } static void UpdateBrateTbl(u8 *mbrate) From patchwork Mon Oct 24 08:14:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 8208 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp317421wru; Mon, 24 Oct 2022 01:18:54 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7fJKTMN7IEJDFoZ8iHU7OmiEDZCXgDANrRVK8tuWbO4N/Nyk4R9w2TA8t0XYtYlc495nBo X-Received: by 2002:a05:6402:5162:b0:457:6ef2:df3 with SMTP id d2-20020a056402516200b004576ef20df3mr29566014ede.128.1666599534090; Mon, 24 Oct 2022 01:18:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666599534; cv=none; d=google.com; s=arc-20160816; b=hsTf0hskV3TvilGKWSduatpH6uqXZ0PYipI1xwKxEPyE5kC/FH4J2IfjsLZafaRYTk HcehYLl/w/XHkPYJ4U4Myr6kigc/xJmq5LZ7E+ZlBtfsBGK3FBtlDIDy4SpqecrgIIJ/ 25GSGJeQnPDaCRoBtYiDOsUsaxodr74cn5tpxX+5oMBvEBrjR17VpRKkJmkoqDUL9kZ8 mmwLkwjg9Z92rWaOXED95YkS99ztnyWJH2c24fHT4oAciiQvWQxd/0K4PDRZ2XiohYqt cFuoslQI7dnCxrcAemctVkouPUyiqy0tWEeUyJ18YPITZLd/84bU7PdlmWXeNSHQ5Ly1 zrPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=utt2NrFZ1LZxcmesTnZABMZ0JXtpIpLRlvGxTMurJXI=; b=BKffyiZW1/E3jlI2PgWYaD1aqBeGMLsWh7aLNX8N8a+sHLGLgKJuYt94+ysOGToKmZ XjUD3IKTixoQPdAOeVTHj1UAUmuMXjOLVfVtgurIug5NCD+ycFUf/FTVLF0CIp3WdacC lrMs5DCpKlKkblr1fD58Vk5K+M2fHVrpElMYHeVFbLe78F6MLWHmuVRHw3LgCY/Ghsh9 8GAtN+bLoxUvB+BRNWOQxuiv6uKI2ArkVRPiYJ3y7HdHrA9qEkJLoZZGT4bbUsNpAlR1 XcNa7W52n5nqmXxGMK5BQS6BSLMWKCutrUPlfGYkPoXSEFY65iE7kdH5SlcjxUVv0clE 1HuQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sc41-20020a1709078a2900b0078d027ceb41si30773448ejc.857.2022.10.24.01.18.30; Mon, 24 Oct 2022 01:18:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230285AbiJXIPm (ORCPT + 99 others); Mon, 24 Oct 2022 04:15:42 -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 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747556273506062953?= X-GMAIL-MSGID: =?utf-8?q?1747556273506062953?= 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 --- 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, struct recv_frame *precv_fram go2asoc = 1; else return; - } else { - /* this is also illegal */ - return; } if (go2asoc) { From patchwork Mon Oct 24 08:14:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 8218 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp317732wru; Mon, 24 Oct 2022 01:19:59 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5St+jY/1w8i8BdEGB42mMpeEFn/hTgo1iSVZG68FhY7L6g3MjdbpS7QzKPtNDhNhuo0zgo X-Received: by 2002:a05:6402:27cd:b0:45c:db6f:7e77 with SMTP id c13-20020a05640227cd00b0045cdb6f7e77mr30290781ede.149.1666599599100; Mon, 24 Oct 2022 01:19:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666599599; cv=none; d=google.com; s=arc-20160816; b=CL+tv7/uGJi0gD3WwVnBXmX+/rJ3W8/LLJWDEhP4wyD0dnPfrb3A0Gh05CKqhon3Q4 n7kOBESu7fjHU3C85B1co/vUdRptPP92dWdrFhlprZSb1M1ShiR3iZ0FZ+1vu/TX6JRr oVi5LLJk/EwCROKnEZZlqkrHjgTEYuDoQFFrDdVaTfWL7QrjeC5czLlJgaWYyTS77178 V/hfDveK5fDneL0+dABBUdXRuT/9QI7fHzM5xL+T0m/9UnTEly0pkw7F5KjJW/yA0/AW AP+qyxPam2/aTnUrjwKKoCRNOeWCncoQ9zjyIGj9DdecbszuIlgsfl5vupBAHtKs5Bt3 2tZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=0jeHLya9i1OKGbraGLx3APqV8wwSbJpFywce7jcr7YU=; b=DPTmocDniacZwbT+YbHgQLBHWPJgZnbK+9UZLiFt8yxTwAxtVS5fl48FPcnauB0osV oFE0z/MxoRFIeLFsxU+mMYYjCMebF5aYLCqqooj9DKB9HrbdAbfM7DRRbz1gU83QnXBf ZWQZPQ2ZiWazbtFsL9/8rkEs7kKP6ld7wxWB4sDLiazVfGL3mjKNy0KtsrKuiLeA5qvs RTxIGjgoDIQxUXwXL56BMemN4wZBW7Wmg2PjI6F2D76ZNLCFNcQWRcXRWhoXatyeTfG9 aQytrMfV2q8roIlPhJ+Qw9OyJ8lKcs3EZBZS8ROW+l/ujr20DpJ2LNbz+o7GARr7EQLb /b4A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id mf4-20020a170906cb8400b0078e1cd71067si24037999ejb.205.2022.10.24.01.19.35; Mon, 24 Oct 2022 01:19:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229718AbiJXIQO (ORCPT + 99 others); Mon, 24 Oct 2022 04:16:14 -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 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747556341221443530?= X-GMAIL-MSGID: =?utf-8?q?1747556341221443530?= Remove a return statement at the end of a function. Signed-off-by: Martin Kaiser --- 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, struct recv_frame *precv_fram return; } - if (go2asoc) { + if (go2asoc) start_clnt_assoc(padapter); - return; - } } static void UpdateBrateTbl(u8 *mbrate) From patchwork Mon Oct 24 08:14:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 8211 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp317527wru; Mon, 24 Oct 2022 01:19:12 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5sRJRXPEguG8d7ZOD6UxMT9LoXeiRRE5zTRYHFAoa48045P+5LHyffgM4diEV8v4zydbuU X-Received: by 2002:aa7:c504:0:b0:461:122b:882b with SMTP id o4-20020aa7c504000000b00461122b882bmr18548938edq.14.1666599552202; Mon, 24 Oct 2022 01:19:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666599552; cv=none; d=google.com; s=arc-20160816; b=SDMUZg25MZ3lYyKStc48R9R/H8+UGTtkHZIZdyW3D8ilM6TN2CcLiCNN7NISWTf0cp atQ7kKk2tR8ItkjJ/F/tCf8WNoNgoO7xpKnj7AMbx2SZuIH//WUazbDU2BtJQed52fug D+PA/09+6sEy4GFYVytuxLH9Xme+G73lfU0kdU89rJ0FrGoG+k4UU3nxxRqs/dMKrjEk ngmMuXp12vXgEKRkhD1f1+ti7pXXVbA7EQqsM5a0jLy68o1Fp4E1OPcwo/EDkWNGPhsV W6sF5dHgNi8IcArYCiVOode/fgKpM66d4E5nBBFK860ad+1SoB3JJYmjMFF9Y7t8FXCo ab1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=t88/uKwgGYYucGHU2CsWrvPj6Mqlde9rb3qzWXt9rVs=; b=Df+XRYH3+IQ6/R3n5Li6bn7TcJ0yaOKqr0McyXD2jukUi/+4YPcUm/GRTL/abtgXB1 YNT8bmGcyqAF+Gdgl58vROeyLbm6C7cYaB0q0YQkiJFeytFPGXuDs04zwi5ArxDfzqof n3ZeqP/j1UbdwdmycehHbN+V2G8bGbhP7MaV8BxhXaAadhJx2YzC6JW2QvP+9lpPzLhR UFkVGUwFVeQVIudOa1y48R3TD+ISGVjZC+QTyLGCFCMXCMn5gt5gfbOB2MUriovidltA eVrcGLNn+N+OLe1JWYuzuwcE7ngJ3168ne4PTFogO5IuyA0FICDWi47mT36smPp81VYJ 0JLQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e14-20020a056402190e00b0045b965cf1dasi30583649edz.175.2022.10.24.01.18.48; Mon, 24 Oct 2022 01:19:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230309AbiJXIQB (ORCPT + 99 others); Mon, 24 Oct 2022 04:16:01 -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 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747556292100249014?= X-GMAIL-MSGID: =?utf-8?q?1747556292100249014?= 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 --- 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, struct recv_frame *precv_fram } else if (seq == 4) { if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) go2asoc = 1; - else - return; } if (go2asoc) From patchwork Mon Oct 24 08:14:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 8212 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp317539wru; Mon, 24 Oct 2022 01:19:14 -0700 (PDT) X-Google-Smtp-Source: AMsMyM43egIxdizBDrKBwbt0ZhIXdfBtlypCS9qcwXN+Nc0GTE/8u4g1OaErcYoP6789aAFMe1+3 X-Received: by 2002:a17:907:9811:b0:79a:a1fe:8be6 with SMTP id ji17-20020a170907981100b0079aa1fe8be6mr13873998ejc.480.1666599553986; Mon, 24 Oct 2022 01:19:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666599553; cv=none; d=google.com; s=arc-20160816; b=JUYjtJ4h/4GNj01tewH9TXVoDI1Qn6vdKUAMHJkFYy0tgiUBrhYrKwLR4Rl7bDPNfE 5gQRZnKOIYbeVYDhvzBspZEPQ6T8ARzzmFlGc+fTO2E7D3lFadHEbNW8m4vg6gXxLjKP yZBhIEVZR9SEr4N4Ys5STvKUBFPzh91iAh9Tt9IAhNkvyTcRnW2HcKzBFuuZO0h0yDZH YU8n316L3vMafhJ2g/aYPA3bWk59U1MG47nZDbrv5TKAtNbrlbqcLBkrJkVo3dmsvceU x+XioIPlL+CkISIf7nabyIPxHsN8hlgVxhQK3EERxInQq6wAaiaVrrxIomBd5rQt9rnY sZQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=JS9iLKAeDkiVJWxWw1cz3/8UrGOdyMEPQZrXu7NwBDw=; b=CVj8olOq5cU1DN5Np44TijDjDKuh0cAzIsa1d8Q7m4G+g+urx5407ShL5G/XYxMtPy eHoSL7cipVHbFIuHEpQhSWitab5IwW7KjSGtEx+P6LjpBw5ngdfEJ9KN2cF5+AZ96pEv V38EB+5OTFqn+czhh5rI4SyYwOpx+04MisRXF5jleuRqvnNimfS/aDok/omUh+w/sM8Z y2/MUpmrCSK61euZ4Y2Nn2r51Xbf+7o2CtD3nQd1zEy+kInBljMaYfBkdTdjSQxDu3nL ArL5M/3JIQNuD5h5TffwobKUqA0DpM9r80iexCXBVDi3+A6/JYTCtnJ3D9renQ0CUCIp RJqw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b20-20020a056402351400b00461c0980a0dsi2842570edd.163.2022.10.24.01.18.50; Mon, 24 Oct 2022 01:19:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230332AbiJXIQF (ORCPT + 99 others); Mon, 24 Oct 2022 04:16:05 -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 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747556293978942894?= X-GMAIL-MSGID: =?utf-8?q?1747556293978942894?= 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 --- 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, struct recv_frame *precv_fram { unsigned int seq, len, status, offset; unsigned char *p; - unsigned int go2asoc = 0; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; u8 *pframe = precv_frame->rx_data; @@ -843,15 +842,12 @@ static void OnAuthClient(struct adapter *padapter, struct recv_frame *precv_fram return; } else { /* open system */ - go2asoc = 1; + start_clnt_assoc(padapter); } } else if (seq == 4) { if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) - go2asoc = 1; + start_clnt_assoc(padapter); } - - if (go2asoc) - start_clnt_assoc(padapter); } static void UpdateBrateTbl(u8 *mbrate)