From patchwork Sun Oct 23 17:08: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: 8067 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp71550wru; Sun, 23 Oct 2022 10:13:28 -0700 (PDT) X-Google-Smtp-Source: AMsMyM49CnQQJ2mm/hICWBZT9FkIh1hqxZ0NiGP9QLZxVIks6NFXJ+NfNykvtlSPTEZoui+OcwDF X-Received: by 2002:a17:903:2348:b0:186:970e:739e with SMTP id c8-20020a170903234800b00186970e739emr5891427plh.115.1666545208318; Sun, 23 Oct 2022 10:13:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666545208; cv=none; d=google.com; s=arc-20160816; b=bdO9f2+Isr2eS99A3ClAuWrCfifo5rdE6GZhYLRJtFWh+J9TS3ShIMqreAM83zk3n6 qxtSnOtxnoKkghYHkjCXvJJvrvNjWNFwPPBAl5//c1Io99QMnNoEYZpcJsLnDlrgYO4G e83JOMUZymp30QeL3kZJ4T+wBRJxtTO+9+OUDHwsps3RQz6cPf8wSdVi0wfHv0nnQBCH jJJtZWmpTl7ScDt+NWEIqxwvef1RQ8Fq/9RaowZI+ThS6ju5af9mDY1Q1Njxxiqw07WZ eRwXfIDsUsb2cMLU3thg64/k54rvTMcCP4r5QRp6rXTF4b+Jw0dO3lTzMdzc33lms2BL c74w== 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=YYmDQzxKldflmJUNnmc/tkpay4dJSpMLgrJUhystUjU=; b=a7rceQTKYI4g9aklmIggDQSrAir/IGZ+bqDRN31NHMvw9cF1jDSexWbDhg6QJY9ci2 syKbSJknyvuELiPusCPxddL3OE6PSpTbF60QQpALXdI4vbeEM4FE/ca8/8+WsC5QmMJK g/RkGYEgIPs/GXc5mRzYPSe59ijryuXZihBZUlveR52v+ySQrwPMFNrfK/EunlVso6DC gF4oWQJFm59WgkzYOaZqwwk5wgerYCu6ct7mVZXbme52MFshwgXBxzEPfciv3dRuL+GE 0CJ89mwOLtZzUVYzSlAZ4N/X1nuO3+qPy8TYU+yjdkqdA3WT58mNwY7tuJTLrJJUxlTw MVcA== 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 oc1-20020a17090b1c0100b0020ad6d218cdsi8179949pjb.3.2022.10.23.10.13.15; Sun, 23 Oct 2022 10:13:28 -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 S230338AbiJWRIa (ORCPT + 99 others); Sun, 23 Oct 2022 13:08:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230307AbiJWRIY (ORCPT ); Sun, 23 Oct 2022 13:08:24 -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 8FA3B73305 for ; Sun, 23 Oct 2022 10:08:23 -0700 (PDT) Received: from ipservice-092-217-070-181.092.217.pools.vodafone-ip.de ([92.217.70.181] 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 1omeSR-0000Rj-98; Sun, 23 Oct 2022 19:08:19 +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 4/5] staging: r8188eu: remove wait_ack param from _issue_probereq_p2p Date: Sun, 23 Oct 2022 19:08:07 +0200 Message-Id: <20221023170808.46233-5-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221023170808.46233-1-martin@kaiser.cx> References: <20221023170808.46233-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?1747499308185042564?= X-GMAIL-MSGID: =?utf-8?q?1747499308185042564?= The only caller of _issue_probereq_p2p sets wait_ack = false. Remove the wait_ack parameter and the code that would run only if wait_ack == true. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c index 61d2680cbafc..d44e455f09ca 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -3291,7 +3291,7 @@ void issue_probersp_p2p(struct adapter *padapter, unsigned char *da) dump_mgntframe(padapter, pmgntframe); } -static int _issue_probereq_p2p(struct adapter *padapter, u8 *da, int wait_ack) +static int _issue_probereq_p2p(struct adapter *padapter, u8 *da) { int ret = _FAIL; struct xmit_frame *pmgntframe; @@ -3564,12 +3564,8 @@ static int _issue_probereq_p2p(struct adapter *padapter, u8 *da, int wait_ack) pattrib->last_txcmdsz = pattrib->pktlen; - if (wait_ack) { - ret = dump_mgntframe_and_wait_ack(padapter, pmgntframe); - } else { - dump_mgntframe(padapter, pmgntframe); - ret = _SUCCESS; - } + dump_mgntframe(padapter, pmgntframe); + ret = _SUCCESS; exit: return ret; @@ -3577,7 +3573,7 @@ static int _issue_probereq_p2p(struct adapter *padapter, u8 *da, int wait_ack) inline void issue_probereq_p2p(struct adapter *adapter, u8 *da) { - _issue_probereq_p2p(adapter, da, false); + _issue_probereq_p2p(adapter, da); } static s32 rtw_action_public_decache(struct recv_frame *recv_frame, s32 token)