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 EAFB0A0093 for ; Thu, 28 May 2020 18:25:50 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A64671DC29; Thu, 28 May 2020 18:25:50 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id 109791DC10 for ; Thu, 28 May 2020 18:25:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590683148; 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: in-reply-to:in-reply-to:references:references; bh=nqwbBj1hElllIX94oXwp7wnFsrMT0BcnZGqWDA6Tegk=; b=faQauzUh+RgsKucn9MlqkwkwhNjP2TxN63UnrZgycx+7ojvj8RI/AxtJZjD2MbNLxP5ZDI ievKv6/gTal6GPgTcFArtQ3OusjdX5YddAS6bxOtc9oWc3QSzgyFMSnLjAdTaGdnvgsjXv GrN1UfTkfglzx2qEjp8N/uEIIVoN4lI= 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-475-1DKYzxoIP2yq2Pmm4NT3nQ-1; Thu, 28 May 2020 12:25:45 -0400 X-MC-Unique: 1DKYzxoIP2yq2Pmm4NT3nQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D31C4872FE1; Thu, 28 May 2020 16:25:44 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id C560960C05; Thu, 28 May 2020 16:25:43 +0000 (UTC) From: Kevin Traynor To: Michal Krawczyk Cc: Igor Chauskin , Guy Tzalik , dpdk stable Date: Thu, 28 May 2020 17:22:55 +0100 Message-Id: <20200528162322.7863-68-ktraynor@redhat.com> In-Reply-To: <20200528162322.7863-1-ktraynor@redhat.com> References: <20200528162322.7863-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ena/base: fix indentation of multiple defines' has been queued to LTS release 18.11.9 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 LTS release 18.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/03/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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/c0e2971258ad31f13b64abdfaae20e456c319fdf Thanks. Kevin. --- >From c0e2971258ad31f13b64abdfaae20e456c319fdf 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ena/base/ena_com.h b/drivers/net/ena/base/ena_com.h index 2e80ad563f..f373d50c50 100644 --- a/drivers/net/ena/base/ena_com.h +++ b/drivers/net/ena/base/ena_com.h @@ -38,7 +38,7 @@ #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 @@ -85,5 +85,5 @@ #define ENA_INTR_BYTE_COUNT_NOT_SUPPORTED 0xFFFFFF -#define ENA_HW_HINTS_NO_TIMEOUT 0xFFFF +#define ENA_HW_HINTS_NO_TIMEOUT 0xFFFF enum ena_intr_moder_level { -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-28 17:13:02.616356350 +0100 +++ 0068-net-ena-base-fix-indentation-of-multiple-defines.patch 2020-05-28 17:12:59.148555337 +0100 @@ -1 +1 @@ -From 5dcdfbfaaf5c4223cdcbb2d08995236bfdb7e3c8 Mon Sep 17 00:00:00 2001 +From c0e2971258ad31f13b64abdfaae20e456c319fdf Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5dcdfbfaaf5c4223cdcbb2d08995236bfdb7e3c8 ] + @@ -16,2 +18,2 @@ - drivers/net/ena/base/ena_com.h | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) + drivers/net/ena/base/ena_com.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) @@ -20 +22 @@ -index 6c9943df79..61074eaf63 100644 +index 2e80ad563f..f373d50c50 100644 @@ -23,2 +25,2 @@ -@@ -9,7 +9,7 @@ - #include "ena_plat.h" +@@ -38,7 +38,7 @@ + #include "ena_includes.h" @@ -33,2 +35,2 @@ -@@ -34,7 +34,7 @@ - #define ENA_HASH_KEY_SIZE 40 +@@ -85,5 +85,5 @@ + #define ENA_INTR_BYTE_COUNT_NOT_SUPPORTED 0xFFFFFF @@ -39,4 +41 @@ --#define ENA_FEATURE_MAX_QUEUE_EXT_VER 1 -+#define ENA_FEATURE_MAX_QUEUE_EXT_VER 1 - - struct ena_llq_configurations { + enum ena_intr_moder_level {