Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp1036412pxj; Fri, 4 Jun 2021 04:40:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzm2e0ksEKx6Zv9G8uHum5WkbxBN3VtnreBns5EhEBqgtIuuRXh0HiO1Atbmn0kUHUcRCE/ X-Received: by 2002:a17:906:6d51:: with SMTP id a17mr3717401ejt.543.1622806834920; Fri, 04 Jun 2021 04:40:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622806834; cv=none; d=google.com; s=arc-20160816; b=xIZX8DMvQv+zpwlWXaebte6FSZRmJ1fS/2Ynqebfa39cd4GgImpFv+XcUBrWLL6CLg +zckaejtEEgr9Klz9/tS2GHxWr4Awu0hwwXrQq20T4mtaBAr0Gs3RF6KL260PB+JFZsg xk2icfO3wLvPTiYan1PK0/9O7BDqsKMZdWxiqGA5CNrCEzKvpfQRC+zpDqYAe47NUor7 4ZnLmE5Lf0VQaVPuzjV0hXowQd2vm9L0XH2WbWIlBpLektjAQfANm7ommQbPdu4hKlPu Bdcz2UW2LTtc2votL/dTJ118/S7pSdiAcZobrp/lQ7jD7ttQh3Ln4SL0LJzImWqNjstw 5F5A== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=cmT1HrZEfeL82Y23E0J70CYdtkS00cX34Xo3Q2BxNG4=; b=UCu2UJrX0eI9UCFHOLZc9pyiJlMWE+NUtzLyYCNlxtAdzi8EdmT0/SoH2p7xRvWFEs +n6Zxa4bCG7zIAuiLFEv676Lv42QaG0F1oTLnwpGmKwkjRAHYCYiAwVCeF2gH+V1baBC jZWI0LJT0vw5DCr6E16cWVqsEZIAdtWp1VrTxoS0hxhmN0loLEA+ndP2uSdLxVtMY2+X vovnoHm5xxt2peAl892nWCF6LL4c427p5UFEgRwvKedH7+6Xxq78jope2U39eILOfEGX FhZXl3+sKcnKyuvQxXxNktYHtRVdiC6Ql2RCc92IL0JLigGFQd/ThYD1gs2e9Lu4gG9N /Nkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=UX+QH+7O; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z5si2713507ejx.415.2021.06.04.04.39.59; Fri, 04 Jun 2021 04:40:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=UX+QH+7O; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230158AbhFDLi1 (ORCPT + 99 others); Fri, 4 Jun 2021 07:38:27 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:39459 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229980AbhFDLi1 (ORCPT ); Fri, 4 Jun 2021 07:38:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622806600; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cmT1HrZEfeL82Y23E0J70CYdtkS00cX34Xo3Q2BxNG4=; b=UX+QH+7OHo/ylUMBO7uS3/xT4gaDKLlQUh8UMG0d3YS5Urddt6PWuWqjbqGyQmzBcdeALr l3bcKCuKrgJr04GdPoxzgj9TAbTRiWIhYZzIvN+923asw33i1DAbR3aYx4eXUxhelzFbvH tOrBKO5OFgpETzw9LFevtr/hRbNfBWc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-306-h0P-z7AxNweIe4sGF7twrw-1; Fri, 04 Jun 2021 07:36:39 -0400 X-MC-Unique: h0P-z7AxNweIe4sGF7twrw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 422376D5C0; Fri, 4 Jun 2021 11:36:38 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-201.ams2.redhat.com [10.36.112.201]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3239F5C26D; Fri, 4 Jun 2021 11:36:36 +0000 (UTC) From: =?UTF-8?q?=C3=8D=C3=B1igo=20Huguet?= To: rajur@chelsio.com, davem@davemloft.net, kuba@kernel.org Cc: ihuguet@redhat.com, ivecera@redhat.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, hdanton@sina.com Subject: [PATCH] net:cxgb3: fix incorrect work cancellation Date: Fri, 4 Jun 2021 13:36:33 +0200 Message-Id: <20210604113633.21183-1-ihuguet@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In my last changes in commit 5e0b8928927f I introduced a copy-paste bug, leading to cancel twice qresume_task work for OFLD queue, and never the one for CTRL queue. This patch cancels correctly both works. Signed-off-by: Íñigo Huguet --- drivers/net/ethernet/chelsio/cxgb3/sge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/chelsio/cxgb3/sge.c b/drivers/net/ethernet/chelsio/cxgb3/sge.c index fa91aa57b50a..d1dfccdf571d 100644 --- a/drivers/net/ethernet/chelsio/cxgb3/sge.c +++ b/drivers/net/ethernet/chelsio/cxgb3/sge.c @@ -3310,7 +3310,7 @@ void t3_sge_stop(struct adapter *adap) struct sge_qset *qs = &adap->sge.qs[i]; cancel_work_sync(&qs->txq[TXQ_OFLD].qresume_task); - cancel_work_sync(&qs->txq[TXQ_OFLD].qresume_task); + cancel_work_sync(&qs->txq[TXQ_CTRL].qresume_task); } } -- 2.31.1