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 E99D4A0527 for ; Mon, 9 Nov 2020 19:43:47 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E3CD19AFA; Mon, 9 Nov 2020 19:43:46 +0100 (CET) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by dpdk.org (Postfix) with ESMTP id 6A5DA9AFA for ; Mon, 9 Nov 2020 19:43:44 +0100 (CET) Received: by mail-wm1-f41.google.com with SMTP id v5so467189wmh.1 for ; Mon, 09 Nov 2020 10:43:44 -0800 (PST) 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=46wMgO4fMNHLzcZ2Cft2sM94ngz9oPUteHcuAyiltuI=; b=WuOG0BgVUFsmt7QADWcFmd/wYgs3vB1A8OQ+K2vTgcCo+0U9XC3yr2lEWSUCiTZWEu xklOMZw3Mfr6PzglLOFhDdO2jnHHJgdfRxpYJzI8iK2CTVIfNvv1ckOcG6phwDeTUyIP jpCvyYVoqcAsTpdyPnTuEWZIqr7+fA06/Wuw9/TM7BVz7pT0eO2BtUKRqgChvUPQywFt 7ev/7rnlVZX5QZ64/vIjxqPglgPvljprbl1OmKveuepT8vuLjh4gLGSivo1KikhMOZVi JR43m7rS4+eGYcTHoyolCX937kHlPMsVb4bz2wjAEDZrNcj/TAyBg7EguqXsue5/jDyy wPrg== 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=46wMgO4fMNHLzcZ2Cft2sM94ngz9oPUteHcuAyiltuI=; b=PF2jTSmu8SCX+SCXd+LK0zNGxFRoOGFE/120rflCFCy/m8kZqMjy76fIfA1MA4TKHT V4cbAoi4AcFsxHQ0xOQpbAcBFQfgI2mCNbCcELRUAkGKkofvBSQrmJfONf0E6+Z0VZGp lYXj6QkP3g/+vWMTbGlC4lRL+dUf3pc0SdUFpklwgzrxMMTBKsF/5BEjzGAuyANoOwO9 rYvD307/2hfCfwc7meR/udD4QV7xfD5fmq479bSg3GEC22hprOA3WoS4NWx5tOC5OnhU 4A2Z0npJMmxsNbmzxaQkx3D0+8gZG/1/nZqSRmKb3bkfOgc2gM1Pup5U/gAlEI9UAYzR 1pKw== X-Gm-Message-State: AOAM531w0Vo6NzO6Lj9VmBl+XvuVqshHUTapDSPmlzuPnnrlkYTd0HPV hm9tGrJknZiyOd9zlSGXnEiKUvNZBpQJp15w X-Google-Smtp-Source: ABdhPJwwmCXH0dEL5rw9dSo/hMUKshBvxEfBAxt8RnQN+R+6zTrkuvTTs0d8rUrnpDZTK22cAttcUQ== X-Received: by 2002:a1c:bcc1:: with SMTP id m184mr538154wmf.132.1604947424204; Mon, 09 Nov 2020 10:43:44 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id k84sm320219wmf.42.2020.11.09.10.43.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 10:43:43 -0800 (PST) From: luca.boccassi@gmail.com To: David Marchand Cc: Michal Krawczyk , dpdk stable Date: Mon, 9 Nov 2020 18:40:33 +0000 Message-Id: <20201109184111.3463090-45-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201109184111.3463090-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-207-luca.boccassi@gmail.com> <20201109184111.3463090-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ena: remove unused macro' has been queued to stable release 19.11.6 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/11/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/df6c635e40bfae7c9fe72d15f3b580d16b5138a9 Thanks. Luca Boccassi --- >From df6c635e40bfae7c9fe72d15f3b580d16b5138a9 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Fri, 23 Oct 2020 10:43:51 +0200 Subject: [PATCH] net/ena: remove unused macro [ upstream commit 8bb7b198297d4d33b720b69480e2b41fb9ca91fb ] This assert macro is not called anymore. This also fixes an invalid reference to RTE_LOGTYPE_ERR that does not exist. Fixes: 3adcba9a8987 ("net/ena: update HAL to the newer version") Fixes: 6f1c9df9e9cc ("net/ena: use dynamic log type for debug logging") Signed-off-by: David Marchand Acked-by: Michal Krawczyk --- drivers/net/ena/base/ena_plat_dpdk.h | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h index 5a9d71749e..a8c33dc4d4 100644 --- a/drivers/net/ena/base/ena_plat_dpdk.h +++ b/drivers/net/ena/base/ena_plat_dpdk.h @@ -71,19 +71,6 @@ typedef uint64_t dma_addr_t; (rte_get_timer_cycles() * US_PER_S / rte_get_timer_hz()) extern int ena_logtype_com; -#if RTE_LOG_DP_LEVEL >= RTE_LOG_DEBUG -#define ENA_ASSERT(cond, format, arg...) \ - do { \ - if (unlikely(!(cond))) { \ - rte_log(RTE_LOGTYPE_ERR, ena_logtype_com, \ - format, ##arg); \ - rte_panic("line %d\tassert \"" #cond "\"" \ - "failed\n", __LINE__); \ - } \ - } while (0) -#else -#define ENA_ASSERT(cond, format, arg...) do {} while (0) -#endif #define ENA_MAX_T(type, x, y) RTE_MAX((type)(x), (type)(y)) #define ENA_MAX32(x, y) ENA_MAX_T(uint32_t, (x), (y)) -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-09 18:40:12.953500000 +0000 +++ 0045-net-ena-remove-unused-macro.patch 2020-11-09 18:40:11.167311842 +0000 @@ -1 +1 @@ -From 8bb7b198297d4d33b720b69480e2b41fb9ca91fb Mon Sep 17 00:00:00 2001 +From df6c635e40bfae7c9fe72d15f3b580d16b5138a9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8bb7b198297d4d33b720b69480e2b41fb9ca91fb ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index ae4fd8f868..a6782f3732 100644 +index 5a9d71749e..a8c33dc4d4 100644 @@ -24 +25 @@ -@@ -73,19 +73,6 @@ typedef uint64_t dma_addr_t; +@@ -71,19 +71,6 @@ typedef uint64_t dma_addr_t;