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 735BCA0093 for ; Tue, 19 May 2020 15:09:00 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6A2B71D689; Tue, 19 May 2020 15:09:00 +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 75E581D698 for ; Tue, 19 May 2020 15:08:56 +0200 (CEST) Received: by mail-wr1-f67.google.com with SMTP id i15so15788950wrx.10 for ; Tue, 19 May 2020 06:08:56 -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=qpsZqNFZyoncFqipFYqJiu8ROP4oOFD1wFDIUAGLEJk=; b=nmnyAAnpQqbZ1yRmwnrlCOtKWEzPuDFNrX0oK0n9ti3rG75B8Lt29bQ7+qq++BNTtS 0dvGCJCDd8ZB15BnDktRkUqYfeACiwoPUl4WzSEtHIWu6Qgcqywrd4aEraP/VUZY2A7C 5QCJVT+Ou3WfDREZ+oy3VY0/Ai53DNW2jpX3tcjwF6ODdqz+UGZtEnjzbXcwpv9C5BSc 61Cieppa14/+I3TjbK1nTyBG66XKHwbUW3ueWvvT7ZuK4FvBCeTQTCYh/T2Bvb8Vrd7l caEsP/JaVGOfYDorwkZrQwm8AM6Uzr/KpMjJlRf7p6qmw41mpWcnNza5oNJznp2F9xbs BwPQ== 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=qpsZqNFZyoncFqipFYqJiu8ROP4oOFD1wFDIUAGLEJk=; b=R7ega4gSH7y6neLBWPNtzygq3Sgxz6JhsETxTdR7H9LD88wTubuXKfrd0tGUwzaDoK AMr0zEqIIo7264TM05CeJfbBZZ/8TJvUGNT7+xSZsyqJZ8vYKWpwKhfOgJKCY7mio1l/ emLWtG3UEQB1mUXy3pVYuMbQGL3pSkXMibZ0TyA7QgkAPJN8J/dkO35Exq4DDsZpCfSf JF2aawXZgUPUitehrkl/RU2Z5FxNaQaULcvhsi45L5+QK+MaSmIUL9s6cp0UDU87kdCr bIbij0vLx0Ch5CukDEDEomGjAgxVrOa9/jo7l+W9cQyjFOq4+9d0MKesSA83s8dmfAHm pQxw== X-Gm-Message-State: AOAM531TEefGLEt+5nw7n014ozxPbsUFrx82wt4etsvFneZnZWWSTbLA 15j+HMOOp2IYBY9GYb71zLI= X-Google-Smtp-Source: ABdhPJzrYGMOi+DJKmgErirYkCGp+TttWenBrpH44hWufElENe31xuSwlvliMnSbaHtm9nLAJFkLiw== X-Received: by 2002:a5d:5089:: with SMTP id a9mr24424254wrt.147.1589893736168; Tue, 19 May 2020 06:08:56 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id a15sm20844228wrw.56.2020.05.19.06.08.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:08:55 -0700 (PDT) From: luca.boccassi@gmail.com To: Michal Krawczyk Cc: Igor Chauskin , Guy Tzalik , dpdk stable Date: Tue, 19 May 2020 14:03:15 +0100 Message-Id: <20200519130549.112823-60-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 of multiple defines' 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 59acd7de4ca7894d6f9ab6fbdd541e66c8649111 Mon Sep 17 00:00:00 2001 From: Michal Krawczyk Date: Wed, 8 Apr 2020 10:29:06 +0200 Subject: [PATCH] net/ena/base: fix indentation of multiple defines [ upstream commit 5dcdfbfaaf5c4223cdcbb2d08995236bfdb7e3c8 ] As the alignment of the defines wasn't valid, it was removed at all, so instead of using multiple spaces or tabs, the single space after define name is being used. Fixes: 99ecfbf845b3 ("ena: import communication layer") Signed-off-by: Michal Krawczyk Reviewed-by: Igor Chauskin Reviewed-by: Guy Tzalik --- drivers/net/ena/base/ena_com.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ena/base/ena_com.h b/drivers/net/ena/base/ena_com.h index 2162eb42b8..f1593345e8 100644 --- a/drivers/net/ena/base/ena_com.h +++ b/drivers/net/ena/base/ena_com.h @@ -9,9 +9,9 @@ #include "ena_plat.h" #include "ena_includes.h" -#define ENA_MAX_NUM_IO_QUEUES 128U +#define ENA_MAX_NUM_IO_QUEUES 128U /* We need to queues for each IO (on for Tx and one for Rx) */ -#define ENA_TOTAL_NUM_QUEUES (2 * (ENA_MAX_NUM_IO_QUEUES)) +#define ENA_TOTAL_NUM_QUEUES (2 * (ENA_MAX_NUM_IO_QUEUES)) #define ENA_MAX_HANDLERS 256 @@ -55,9 +55,9 @@ #define ENA_INTR_MODER_LEVEL_STRIDE 1 #define ENA_INTR_BYTE_COUNT_NOT_SUPPORTED 0xFFFFFF -#define ENA_HW_HINTS_NO_TIMEOUT 0xFFFF +#define ENA_HW_HINTS_NO_TIMEOUT 0xFFFF -#define ENA_FEATURE_MAX_QUEUE_EXT_VER 1 +#define ENA_FEATURE_MAX_QUEUE_EXT_VER 1 enum ena_intr_moder_level { ENA_INTR_MODER_LOWEST = 0, -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:46.944639997 +0100 +++ 0060-net-ena-base-fix-indentation-of-multiple-defines.patch 2020-05-19 14:04:44.208648228 +0100 @@ -1,8 +1,10 @@ -From 5dcdfbfaaf5c4223cdcbb2d08995236bfdb7e3c8 Mon Sep 17 00:00:00 2001 +From 59acd7de4ca7894d6f9ab6fbdd541e66c8649111 Mon Sep 17 00:00:00 2001 From: Michal Krawczyk Date: Wed, 8 Apr 2020 10:29:06 +0200 Subject: [PATCH] net/ena/base: fix indentation of multiple defines +[ upstream commit 5dcdfbfaaf5c4223cdcbb2d08995236bfdb7e3c8 ] + As the alignment of the defines wasn't valid, it was removed at all, so instead of using multiple spaces or tabs, the single space after define name is being used. @@ -17,12 +19,12 @@ 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ena/base/ena_com.h b/drivers/net/ena/base/ena_com.h -index 6c9943df79..61074eaf63 100644 +index 2162eb42b8..f1593345e8 100644 --- a/drivers/net/ena/base/ena_com.h +++ b/drivers/net/ena/base/ena_com.h -@@ -8,9 +8,9 @@ - +@@ -9,9 +9,9 @@ #include "ena_plat.h" + #include "ena_includes.h" -#define ENA_MAX_NUM_IO_QUEUES 128U +#define ENA_MAX_NUM_IO_QUEUES 128U @@ -32,9 +34,9 @@ #define ENA_MAX_HANDLERS 256 -@@ -33,9 +33,9 @@ - - #define ENA_HASH_KEY_SIZE 40 +@@ -55,9 +55,9 @@ + #define ENA_INTR_MODER_LEVEL_STRIDE 1 + #define ENA_INTR_BYTE_COUNT_NOT_SUPPORTED 0xFFFFFF -#define ENA_HW_HINTS_NO_TIMEOUT 0xFFFF +#define ENA_HW_HINTS_NO_TIMEOUT 0xFFFF @@ -42,8 +44,8 @@ -#define ENA_FEATURE_MAX_QUEUE_EXT_VER 1 +#define ENA_FEATURE_MAX_QUEUE_EXT_VER 1 - struct ena_llq_configurations { - enum ena_admin_llq_header_location llq_header_location; + enum ena_intr_moder_level { + ENA_INTR_MODER_LOWEST = 0, -- 2.20.1