From patchwork Mon Nov 7 20:28:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 16671 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2284757wru; Mon, 7 Nov 2022 12:45:17 -0800 (PST) X-Google-Smtp-Source: AMsMyM4r9gXptK/88GHwzkRq7uVKoAoRMoolIhpOIw8TdRgMA/20Hjrm7kv6ZgeoNz823m9p87f0 X-Received: by 2002:a17:903:22c7:b0:187:190d:da89 with SMTP id y7-20020a17090322c700b00187190dda89mr46597658plg.68.1667853917396; Mon, 07 Nov 2022 12:45:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667853917; cv=none; d=google.com; s=arc-20160816; b=VeQnAEeYcWaoWNZJq1KbMuDeFk3OB9VrIXLD07ITfDPCG78EXRlq2Ge91tjT6gZ1qp DZatkbpUEdewJEOdW7mq1dFl0A7vFOUOjfLOrNayuZyu57CQvfQI8l2byA9k6nK3JTCC 4VRn6M36mDXU1rERKFSVvSZ4QTM6QR131ANOWhQJS5YIIwAj13UExznZviWbgQns0TV6 n/GEd8lCc76IICIZ4RK4qnug92Rw3yPZT8yf74+lZu1dvxRNkITD0OamQXaVnOea0ENo RESctTqeDh3ibZGO80T0bWe8Mu6szpyD3bSCTKBum4vUBspBea3yl4XL8+WgvhhDpWa4 0eaA== 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=xfNxVhybfKl5gi348mpSZ7LIuOrIKyGa9hl7V6e0URI=; b=prebQ8dKQXYCzw3UQUAHPigEG4AXDw3kTUGYXVuQA43r2dV5LWKiDyz4HxRqzNBRb/ JyKHVaRh54a6gMLtTQ2f8qO1jSetD30CeyGfWFRAhJXMmz/STGWkqnhbyfxF1YpMcpv7 fSJTWG78DNCk2WuN1xikrSFPI2z5aFbVYBjuEVg2CHjtmHTGpWkSQebQN2mGjG0rC45P EKKw4An1J2lSDFDan7VXIraztCAmuz1i6f/1gZMFLkAMDfdySsAq8HYKnSMBUWgXZwJa ckWQ5/wMoF9XXQCrylRcEAlcLFM2y7BP2PwCpXTo51cibqtI1rGS76wI8iF73Ca/8Q+M CmkA== 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 ot12-20020a17090b3b4c00b0020055731860si13190465pjb.105.2022.11.07.12.45.03; Mon, 07 Nov 2022 12:45:17 -0800 (PST) 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 S232972AbiKGU2u (ORCPT + 99 others); Mon, 7 Nov 2022 15:28:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232895AbiKGU2q (ORCPT ); Mon, 7 Nov 2022 15:28:46 -0500 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 3F4C3201A2 for ; Mon, 7 Nov 2022 12:28:46 -0800 (PST) Received: from ipservice-092-217-067-198.092.217.pools.vodafone-ip.de ([92.217.67.198] 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 1os8jZ-0004bP-6j; Mon, 07 Nov 2022 21:28:41 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH v2 3/3] staging: r8188eu: drop removal/stop check in dump_mgntframe_and_wait_ack Date: Mon, 7 Nov 2022 21:28:24 +0100 Message-Id: <20221107202824.61431-4-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221107202824.61431-1-martin@kaiser.cx> References: <20221107202824.61431-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?1748871589084844979?= X-GMAIL-MSGID: =?utf-8?q?1748871589084844979?= We can remove the checks for bDriverStopped and bSurpriseRemoved in dump_mgntframe_and_wait_ack. The code path from this function looks like dump_mgntframe_and_wait_ack rtl8188eu_mgnt_xmit rtw_dump_xframe loop over all fragments rtw_write_port is called for each fragment. bSurpriseRemoved and bDriverStopped are checked in rtw_write_port. 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 bfd6afd7266e..be33489d3dfd 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -3988,9 +3988,6 @@ s32 dump_mgntframe_and_wait_ack(struct adapter *padapter, struct xmit_frame *pmg u32 timeout_ms = 500;/* 500ms */ struct xmit_priv *pxmitpriv = &padapter->xmitpriv; - if (padapter->bSurpriseRemoved || padapter->bDriverStopped) - return -1; - mutex_lock(&pxmitpriv->ack_tx_mutex); pxmitpriv->ack_tx = true;