From patchwork Sun Nov 6 17:04:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 16164 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1588223wru; Sun, 6 Nov 2022 09:07:30 -0800 (PST) X-Google-Smtp-Source: AA0mqf7ptABp1jCAQfPFyLIn7UjLfeg5jbmdERHTF9Ul8tCkTOeXCe5Y/PQe4F2Q+lta1yhSKqgh X-Received: by 2002:a17:906:4ecc:b0:7ae:4f8e:1d7 with SMTP id i12-20020a1709064ecc00b007ae4f8e01d7mr6591916ejv.339.1667754449848; Sun, 06 Nov 2022 09:07:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667754449; cv=none; d=google.com; s=arc-20160816; b=UWsnEDiSYwiPs6f114XB8ADCVR5wpB/KAEzJ84QJ8pM8mCUgXS/St4qW0LxDcfWoLg is+5MJ9FyqADXm/lxrjx2HwH69m0UUh9Ng0FLXkOAtZYTdzMCAOVkABwT4YPDwKZ+J8r pqDxlYnNWgPO+VFtuNxi2aSXFFNzdo2VouHfv0HWZAZFbLeDkshXwhKjWkVrg+WlftKl HQ+uGvKQgxUe2/4GpwzxuA5H8Ap9kEkKiJR4hQQ/Jyj7YRX+Z3mLHf+jNsBneCqntLV2 LgDcmzs/7QMphkKwGVfQzf67fYkHsVHaUX9M2iKY1Gy9Z8BcgeRf0oLPQ2enOZJRzxr3 KsiA== 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=po3NLlGkiJxkfUDK2Z68WJnMpoPVGiRZeE/ZjIeAsZO8K0lqGaLw4OZsIrtAErHkqH Wvkbjjsvycmnaycgdaf3TUzB3zyRyGXgMJ219cJIdDRfioOQsyk3l/f0/MureKN/JZpu 1F/uHo5nDHRb0MPRztp7wz+yA0XicwPDfm15VxrxANbsoK9AYmcK/gYeBIUXC+ql1Yfz MxHPYJzxIqVTiAvLhL+1I3xD9PueY0IuqvwWWqSmy9pOSEjfTvcfDwNYyJ/xkmUNhOBE mMNrgI53D6EcJka4KkPSIv+OGdGoU13NHM2xAm+6paQiomUFIyr/m+dAY5yuFAclXdfq Gt2w== 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 go37-20020a1709070da500b0078e1246e7d6si7135313ejc.748.2022.11.06.09.07.04; Sun, 06 Nov 2022 09:07:29 -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 S230424AbiKFRG0 (ORCPT + 99 others); Sun, 6 Nov 2022 12:06:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37954 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230327AbiKFRFy (ORCPT ); Sun, 6 Nov 2022 12:05:54 -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 CFB3D10069 for ; Sun, 6 Nov 2022 09:05:06 -0800 (PST) Received: from ipservice-092-217-068-220.092.217.pools.vodafone-ip.de ([92.217.68.220] 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 1orj4v-0001KU-QH; Sun, 06 Nov 2022 18:05:01 +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 3/3] staging: r8188eu: drop removal/stop check in dump_mgntframe_and_wait_ack Date: Sun, 6 Nov 2022 18:04:55 +0100 Message-Id: <20221106170455.743058-4-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221106170455.743058-1-martin@kaiser.cx> References: <20221106170455.743058-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?1748767289568312799?= X-GMAIL-MSGID: =?utf-8?q?1748767289568312799?= 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;