From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 22370A0A02 for ; Mon, 17 May 2021 18:11:14 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1C15340041; Mon, 17 May 2021 18:11:14 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 042D041102 for ; Mon, 17 May 2021 18:11:12 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifpm-0007Yl-TQ; Mon, 17 May 2021 16:11:10 +0000 From: Christian Ehrhardt To: Dmitry Kozlyuk Cc: Ferruh Yigit , dpdk stable Date: Mon, 17 May 2021 18:07:24 +0200 Message-Id: <20210517161039.3132619-15-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/pcap: fix format string' has been queued to stable release 19.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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.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 05/19/21. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/38deda63f6a7e76f758771034ffc5ed2c6e5867e Thanks. Christian Ehrhardt --- >From 38deda63f6a7e76f758771034ffc5ed2c6e5867e Mon Sep 17 00:00:00 2001 From: Dmitry Kozlyuk Date: Sun, 14 Feb 2021 05:16:12 +0300 Subject: [PATCH] net/pcap: fix format string [ upstream commit 198aba383316162e98c6e0c3c53c525ddca0b071 ] Use PRIu32 for uint32_t (found by -Wformat with Clang on Windows). Fixes: a3f5252e5cbd ("net/pcap: enable infinitely Rx a pcap file") Signed-off-by: Dmitry Kozlyuk Acked-by: Ferruh Yigit --- drivers/net/pcap/rte_eth_pcap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c index f4afe67116..9ac0a11ffb 100644 --- a/drivers/net/pcap/rte_eth_pcap.c +++ b/drivers/net/pcap/rte_eth_pcap.c @@ -802,7 +802,7 @@ eth_rx_queue_setup(struct rte_eth_dev *dev, pcap_pkt_count = count_packets_in_pcap(pcap, pcap_q); - snprintf(ring_name, sizeof(ring_name), "PCAP_RING%" PRIu16, + snprintf(ring_name, sizeof(ring_name), "PCAP_RING%" PRIu32, ring_number); pcap_q->pkts = rte_ring_create(ring_name, -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:30.144715089 +0200 +++ 0015-net-pcap-fix-format-string.patch 2021-05-17 17:40:29.119809066 +0200 @@ -1 +1 @@ -From 198aba383316162e98c6e0c3c53c525ddca0b071 Mon Sep 17 00:00:00 2001 +From 38deda63f6a7e76f758771034ffc5ed2c6e5867e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 198aba383316162e98c6e0c3c53c525ddca0b071 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 38b1fe2f77..2766745a71 100644 +index f4afe67116..9ac0a11ffb 100644 @@ -21 +22 @@ -@@ -893,7 +893,7 @@ eth_rx_queue_setup(struct rte_eth_dev *dev, +@@ -802,7 +802,7 @@ eth_rx_queue_setup(struct rte_eth_dev *dev,