From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 638DDA0093 for ; Tue, 19 May 2020 15:08:57 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 51F5C1D6A5; Tue, 19 May 2020 15:08:57 +0200 (CEST) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id 327E41D6A3 for ; Tue, 19 May 2020 15:08:55 +0200 (CEST) Received: by mail-wr1-f67.google.com with SMTP id e1so15853263wrt.5 for ; Tue, 19 May 2020 06:08:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PBCA2xswNm3PJfMiAnNnFCfpP6BZithau47b+8RGLdw=; b=MZps8WVnFtnDLh+XODNuEBuMCbuH/NPneUvjXDq6orsU/HwUpXov5NZ2LQkhtR3MeX hxtNj047cV2lzXY/FuGJ05YdBZAbtmz0CCTPQgO2gUSk5/fGlNGChddAWNX+a26G761K pJsD2DqRUnfSKeFl3L7ezBIQhY5W53Egt3qWph84CKzI58Zy3DxFAh+anemRkVZxd66p awEV9lYzLywkvRBdZJ6nfD9A1bYsP5ApzpbyOwwPu0OZGxvnOcscOMD7pX/+RGPlzwdj +euGj36tSG35yxFEH7v5FbL4ByD6dsCLZbBd1fpH4BmYFUH1r3va2RYJOD8F2Vn8/0ln l1NQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PBCA2xswNm3PJfMiAnNnFCfpP6BZithau47b+8RGLdw=; b=KRgVWki5+rTGUZ2CljDHQfmaKSdeonINLn8Rit9X6rDPX4u1+HPd6FOpFrasntC+E8 f2XlAouCrAn/d4OTrtRoT/TvYzHfKLp6E7aYEyfkEFR+bsSU6hYLLxRqqJgL2hFivk69 Vtv45yg48+dMWoKYaYIBuXyTEBLE5W4JQbJ6xBWMgHixPa1MHT4Eg0cvrIZFmbDv9CTW GGsG9LSIdSuwnKpr8qtb7PPKblHjTDfTs5cUhffWeBi37tvotByaduArpuZHfu+Z/P0P y+8XdIMovEA81d6nGopbYb7f01vF7rzm1jD4kHpaOoVQo8dKyZXWdakJ8ldiaNEFaPuf RibQ== X-Gm-Message-State: AOAM530lKZkiVGuaYI+5ZF6WTowrlTFCBqGSMAygeQgqqSiTdqsMeVSC 2y4xD0UGkxtvgPuFFNrj+QzYHBzu6U2ZJFB+ X-Google-Smtp-Source: ABdhPJw7JUu602vc59ecIAH8LtlKgTga9qpyuPmQuQ6THvWM5agl/Uh6bZVLsVPQ7v7O4cztQ41uqw== X-Received: by 2002:adf:9b91:: with SMTP id d17mr24695771wrc.183.1589893734890; Tue, 19 May 2020 06:08:54 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id 205sm4166329wmc.12.2020.05.19.06.08.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:08:54 -0700 (PDT) From: luca.boccassi@gmail.com To: Michal Krawczyk Cc: Igor Chauskin , Guy Tzalik , dpdk stable Date: Tue, 19 May 2020 14:03:14 +0100 Message-Id: <20200519130549.112823-59-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ena/base: fix indentation in CQ polling' has been queued to stable release 19.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From 3c4bf7946066a84dd2f22b28765997b7463ec5c5 Mon Sep 17 00:00:00 2001 From: Michal Krawczyk Date: Wed, 8 Apr 2020 10:29:02 +0200 Subject: [PATCH] net/ena/base: fix indentation in CQ polling [ upstream commit 6a5283bbad7a17fa5556c55e00e4fe1828039285 ] The spaces instead of tabs were used for the indent. Fixes: 3adcba9a8987 ("net/ena: update HAL to the newer version") Signed-off-by: Michal Krawczyk Reviewed-by: Igor Chauskin Reviewed-by: Guy Tzalik --- drivers/net/ena/base/ena_com.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ena/base/ena_com.c b/drivers/net/ena/base/ena_com.c index 8b51660a45..b3cdf712e1 100644 --- a/drivers/net/ena/base/ena_com.c +++ b/drivers/net/ena/base/ena_com.c @@ -525,11 +525,11 @@ static int ena_com_wait_and_process_admin_cq_polling(struct ena_comp_ctx *comp_c timeout = ENA_GET_SYSTEM_TIMEOUT(admin_queue->completion_timeout); while (1) { - ENA_SPINLOCK_LOCK(admin_queue->q_lock, flags); - ena_com_handle_admin_completion(admin_queue); - ENA_SPINLOCK_UNLOCK(admin_queue->q_lock, flags); + ENA_SPINLOCK_LOCK(admin_queue->q_lock, flags); + ena_com_handle_admin_completion(admin_queue); + ENA_SPINLOCK_UNLOCK(admin_queue->q_lock, flags); - if (comp_ctx->status != ENA_CMD_SUBMITTED) + if (comp_ctx->status != ENA_CMD_SUBMITTED) break; if (ENA_TIME_EXPIRE(timeout)) { -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:46.908385447 +0100 +++ 0059-net-ena-base-fix-indentation-in-CQ-polling.patch 2020-05-19 14:04:44.208648228 +0100 @@ -1,8 +1,10 @@ -From 6a5283bbad7a17fa5556c55e00e4fe1828039285 Mon Sep 17 00:00:00 2001 +From 3c4bf7946066a84dd2f22b28765997b7463ec5c5 Mon Sep 17 00:00:00 2001 From: Michal Krawczyk Date: Wed, 8 Apr 2020 10:29:02 +0200 Subject: [PATCH] net/ena/base: fix indentation in CQ polling +[ upstream commit 6a5283bbad7a17fa5556c55e00e4fe1828039285 ] + The spaces instead of tabs were used for the indent. Fixes: 3adcba9a8987 ("net/ena: update HAL to the newer version") @@ -15,10 +17,10 @@ 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ena/base/ena_com.c b/drivers/net/ena/base/ena_com.c -index 962baf6024..f128d3c4f3 100644 +index 8b51660a45..b3cdf712e1 100644 --- a/drivers/net/ena/base/ena_com.c +++ b/drivers/net/ena/base/ena_com.c -@@ -532,11 +532,11 @@ static int ena_com_wait_and_process_admin_cq_polling(struct ena_comp_ctx *comp_c +@@ -525,11 +525,11 @@ static int ena_com_wait_and_process_admin_cq_polling(struct ena_comp_ctx *comp_c timeout = ENA_GET_SYSTEM_TIMEOUT(admin_queue->completion_timeout); while (1) {