From patchwork Fri Jun 4 11:36:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w43DsWlnbyBIdWd1ZXQ=?= X-Patchwork-Id: 454555 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1343BC07E94 for ; Fri, 4 Jun 2021 11:36:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F031D6141C for ; Fri, 4 Jun 2021 11:36:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230139AbhFDLi2 (ORCPT ); Fri, 4 Jun 2021 07:38:28 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:32811 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229962AbhFDLi1 (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?b?w43DsWlnbyBIdWd1ZXQ=?= 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 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Precedence: bulk List-ID: X-Mailing-List: netdev@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); } }