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 C8B97A04F1 for ; Fri, 5 Jun 2020 20:27:17 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B46331D52C; Fri, 5 Jun 2020 20:27:17 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id DA08E1D530 for ; Fri, 5 Jun 2020 20:27:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591381635; 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=uAqKQPr5q6U+JpBxbMwpLl4zFlFz5/M/+4JYnZT2+Jg=; b=cc9iR0YGvPzxRcabIM3pk2lJTV8Rpi5lGmOokWF1yzjqCtBLqTawezqgwi890grq011QDN izgO561CP2csNVjambuc7rBSpQSnwwQDoE/B/6eiCmNRuj0Du6YOBlQpS62KUvK14DzOZM TXrPiCrPg/1LFulstYAVVo/mkhIy4ds= 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-250-YLFhWjC5PgGoWc4xRhIhVQ-1; Fri, 05 Jun 2020 14:27:11 -0400 X-MC-Unique: YLFhWjC5PgGoWc4xRhIhVQ-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 0C05F107ACF2; Fri, 5 Jun 2020 18:27:10 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id 27AB960C47; Fri, 5 Jun 2020 18:27:08 +0000 (UTC) From: Kevin Traynor To: Ivan Dyukov Cc: dpdk stable Date: Fri, 5 Jun 2020 19:24:45 +0100 Message-Id: <20200605182525.22483-48-ktraynor@redhat.com> In-Reply-To: <20200605182525.22483-1-ktraynor@redhat.com> References: <20200605182525.22483-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 'examples: remove extra new line after link duplex' 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/10/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/ba9c21473a48646ee1de6da01a0eb7120fabd6a9 Thanks. Kevin. --- >From ba9c21473a48646ee1de6da01a0eb7120fabd6a9 Mon Sep 17 00:00:00 2001 From: Ivan Dyukov Date: Thu, 7 May 2020 21:26:02 +0300 Subject: [PATCH] examples: remove extra new line after link duplex [ upstream commit c81e3f21d1ea05e5123278b15d9d5e1257b6ba99 ] This patch removes extra 'new line' in few app examples. Fixes: d3641ae863 ("examples: update link status checks") Fixes: 387259bd6c ("examples/l2fwd-crypto: add sample application") Fixes: 4ff457986f ("examples/l2fwd-event: add default poll mode routines") Fixes: e64833f227 ("examples/l2fwd-keepalive: add sample application") Fixes: 204896f8d6 ("examples/l2fwd-jobstats: add new example") Fixes: c8e6ceeceb ("examples/ioat: add new sample app for ioat driver") Fixes: cc8f4d020c ("examples/ip_reassembly: initial import") Fixes: d299106e8e ("examples/ipsec-secgw: add IPsec sample application") Fixes: 39aad0e88c ("examples/flow_distributor: new example to demonstrate EFD") Fixes: d48415e1fe ("examples/performance-thread: add l3fwd-thread app") Fixes: 20c78ac9ee ("examples/vm_power_mgr: add port initialisation") Fixes: 361b2e9559 ("acl: new sample l3fwd-acl") Fixes: de3cfa2c98 ("sched: initial import") Fixes: d7937e2e3d ("power: initial import") Fixes: 3fc5ca2f63 ("kni: initial import") Signed-off-by: Ivan Dyukov --- examples/ip_fragmentation/main.c | 2 +- examples/ip_reassembly/main.c | 2 +- examples/ipsec-secgw/ipsec-secgw.c | 2 +- examples/ipv4_multicast/main.c | 2 +- examples/kni/main.c | 2 +- examples/l2fwd-crypto/main.c | 2 +- examples/l2fwd-jobstats/main.c | 2 +- examples/l2fwd-keepalive/main.c | 2 +- examples/l2fwd/main.c | 2 +- examples/l3fwd-acl/main.c | 2 +- examples/l3fwd-power/main.c | 2 +- examples/l3fwd/main.c | 2 +- examples/link_status_interrupt/main.c | 2 +- examples/multi_process/client_server_mp/mp_server/init.c | 2 +- examples/multi_process/symmetric_mp/main.c | 2 +- examples/performance-thread/l3fwd-thread/main.c | 2 +- examples/qos_sched/init.c | 2 +- examples/server_node_efd/server/init.c | 2 +- examples/vm_power_manager/main.c | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/examples/ip_fragmentation/main.c b/examples/ip_fragmentation/main.c index 68d40c19ac..0631a1a2d4 100644 --- a/examples/ip_fragmentation/main.c +++ b/examples/ip_fragmentation/main.c @@ -592,5 +592,5 @@ check_all_ports_link_status(uint32_t port_mask) portid, link.link_speed, (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? - ("full-duplex") : ("half-duplex\n")); + ("full-duplex") : ("half-duplex")); else printf("Port %d Link Down\n", portid); diff --git a/examples/ip_reassembly/main.c b/examples/ip_reassembly/main.c index 17b55d4c76..d29efc5354 100644 --- a/examples/ip_reassembly/main.c +++ b/examples/ip_reassembly/main.c @@ -725,5 +725,5 @@ check_all_ports_link_status(uint32_t port_mask) portid, link.link_speed, (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? - ("full-duplex") : ("half-duplex\n")); + ("full-duplex") : ("half-duplex")); else printf("Port %d Link Down\n", portid); diff --git a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-secgw/ipsec-secgw.c index c55606e078..be77a839d3 100644 --- a/examples/ipsec-secgw/ipsec-secgw.c +++ b/examples/ipsec-secgw/ipsec-secgw.c @@ -1326,5 +1326,5 @@ check_all_ports_link_status(uint32_t port_mask) portid, link.link_speed, (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? - ("full-duplex") : ("half-duplex\n")); + ("full-duplex") : ("half-duplex")); else printf("Port %d Link Down\n", portid); diff --git a/examples/ipv4_multicast/main.c b/examples/ipv4_multicast/main.c index 428ca4694e..e7cb4ba566 100644 --- a/examples/ipv4_multicast/main.c +++ b/examples/ipv4_multicast/main.c @@ -599,5 +599,5 @@ check_all_ports_link_status(uint32_t port_mask) portid, link.link_speed, (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? - ("full-duplex") : ("half-duplex\n")); + ("full-duplex") : ("half-duplex")); else printf("Port %d Link Down\n", portid); diff --git a/examples/kni/main.c b/examples/kni/main.c index 5dff7d3b52..6c9f46e77e 100644 --- a/examples/kni/main.c +++ b/examples/kni/main.c @@ -661,5 +661,5 @@ check_all_ports_link_status(uint32_t port_mask) portid, link.link_speed, (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? - ("full-duplex") : ("half-duplex\n")); + ("full-duplex") : ("half-duplex")); else printf("Port %d Link Down\n", portid); diff --git a/examples/l2fwd-crypto/main.c b/examples/l2fwd-crypto/main.c index f12fd266e6..2d79327875 100644 --- a/examples/l2fwd-crypto/main.c +++ b/examples/l2fwd-crypto/main.c @@ -1746,5 +1746,5 @@ check_all_ports_link_status(uint32_t port_mask) portid, link.link_speed, (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? - ("full-duplex") : ("half-duplex\n")); + ("full-duplex") : ("half-duplex")); else printf("Port %d Link Down\n", portid); diff --git a/examples/l2fwd-jobstats/main.c b/examples/l2fwd-jobstats/main.c index a4d28e1782..8443f685d3 100644 --- a/examples/l2fwd-jobstats/main.c +++ b/examples/l2fwd-jobstats/main.c @@ -703,5 +703,5 @@ check_all_ports_link_status(uint32_t port_mask) portid, link.link_speed, (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? - ("full-duplex") : ("half-duplex\n")); + ("full-duplex") : ("half-duplex")); else printf("Port %d Link Down\n", portid); diff --git a/examples/l2fwd-keepalive/main.c b/examples/l2fwd-keepalive/main.c index 16c0a1c034..e74eb1f53e 100644 --- a/examples/l2fwd-keepalive/main.c +++ b/examples/l2fwd-keepalive/main.c @@ -468,5 +468,5 @@ check_all_ports_link_status(uint32_t port_mask) portid, link.link_speed, (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? - ("full-duplex") : ("half-duplex\n")); + ("full-duplex") : ("half-duplex")); else printf("Port %d Link Down\n", portid); diff --git a/examples/l2fwd/main.c b/examples/l2fwd/main.c index 6c23215a54..6ddf94b005 100644 --- a/examples/l2fwd/main.c +++ b/examples/l2fwd/main.c @@ -471,5 +471,5 @@ check_all_ports_link_status(uint32_t port_mask) portid, link.link_speed, (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? - ("full-duplex") : ("half-duplex\n")); + ("full-duplex") : ("half-duplex")); else printf("Port %d Link Down\n", portid); diff --git a/examples/l3fwd-acl/main.c b/examples/l3fwd-acl/main.c index 8ed0c07ec1..f2fe20e48f 100644 --- a/examples/l3fwd-acl/main.c +++ b/examples/l3fwd-acl/main.c @@ -1828,5 +1828,5 @@ check_all_ports_link_status(uint32_t port_mask) portid, link.link_speed, (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? - ("full-duplex") : ("half-duplex\n")); + ("full-duplex") : ("half-duplex")); else printf("Port %d Link Down\n", portid); diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c index 77009ce809..c2a9d36cb6 100644 --- a/examples/l3fwd-power/main.c +++ b/examples/l3fwd-power/main.c @@ -1782,5 +1782,5 @@ check_all_ports_link_status(uint32_t port_mask) (unsigned)link.link_speed, (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? - ("full-duplex") : ("half-duplex\n")); + ("full-duplex") : ("half-duplex")); else printf("Port %d Link Down\n", diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c index 71a67f422b..3ca84c80d9 100644 --- a/examples/l3fwd/main.c +++ b/examples/l3fwd/main.c @@ -721,5 +721,5 @@ check_all_ports_link_status(uint32_t port_mask) portid, link.link_speed, (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? - ("full-duplex") : ("half-duplex\n")); + ("full-duplex") : ("half-duplex")); else printf("Port %d Link Down\n", portid); diff --git a/examples/link_status_interrupt/main.c b/examples/link_status_interrupt/main.c index f3346d23b4..17e77427a9 100644 --- a/examples/link_status_interrupt/main.c +++ b/examples/link_status_interrupt/main.c @@ -483,5 +483,5 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask) portid, link.link_speed, (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? - ("full-duplex") : ("half-duplex\n")); + ("full-duplex") : ("half-duplex")); else printf("Port %d Link Down\n", portid); diff --git a/examples/multi_process/client_server_mp/mp_server/init.c b/examples/multi_process/client_server_mp/mp_server/init.c index 1b0569937b..bf209522f8 100644 --- a/examples/multi_process/client_server_mp/mp_server/init.c +++ b/examples/multi_process/client_server_mp/mp_server/init.c @@ -200,5 +200,5 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask) (unsigned)link.link_speed, (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? - ("full-duplex") : ("half-duplex\n")); + ("full-duplex") : ("half-duplex")); else printf("Port %d Link Down\n", diff --git a/examples/multi_process/symmetric_mp/main.c b/examples/multi_process/symmetric_mp/main.c index 62771e036c..762c3cdfc7 100644 --- a/examples/multi_process/symmetric_mp/main.c +++ b/examples/multi_process/symmetric_mp/main.c @@ -374,5 +374,5 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask) portid, link.link_speed, (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? - ("full-duplex") : ("half-duplex\n")); + ("full-duplex") : ("half-duplex")); else printf("Port %d Link Down\n", portid); diff --git a/examples/performance-thread/l3fwd-thread/main.c b/examples/performance-thread/l3fwd-thread/main.c index 79523d23d3..8ec819dcbe 100644 --- a/examples/performance-thread/l3fwd-thread/main.c +++ b/examples/performance-thread/l3fwd-thread/main.c @@ -3439,5 +3439,5 @@ check_all_ports_link_status(uint32_t port_mask) portid, link.link_speed, (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? - ("full-duplex") : ("half-duplex\n")); + ("full-duplex") : ("half-duplex")); else printf("Port %d Link Down\n", portid); diff --git a/examples/qos_sched/init.c b/examples/qos_sched/init.c index 37c2b95fd6..8f53bafbcb 100644 --- a/examples/qos_sched/init.c +++ b/examples/qos_sched/init.c @@ -154,5 +154,5 @@ app_init_port(uint16_t portid, struct rte_mempool *mp) (uint32_t) link.link_speed, (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? - ("full-duplex") : ("half-duplex\n")); + ("full-duplex") : ("half-duplex")); } else { printf(" Link Down\n"); diff --git a/examples/server_node_efd/server/init.c b/examples/server_node_efd/server/init.c index af5a18e285..ff5b08351e 100644 --- a/examples/server_node_efd/server/init.c +++ b/examples/server_node_efd/server/init.c @@ -260,5 +260,5 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask) link.link_speed, (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? - ("full-duplex") : ("half-duplex\n")); + ("full-duplex") : ("half-duplex")); else printf("Port %d Link Down\n", diff --git a/examples/vm_power_manager/main.c b/examples/vm_power_manager/main.c index 5fa13fe621..30f9ceb73e 100644 --- a/examples/vm_power_manager/main.c +++ b/examples/vm_power_manager/main.c @@ -251,5 +251,5 @@ check_all_ports_link_status(uint32_t port_mask) (unsigned int)link.link_speed, (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? - ("full-duplex") : ("half-duplex\n")); + ("full-duplex") : ("half-duplex")); else printf("Port %d Link Down\n", -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-06-05 19:20:53.451215642 +0100 +++ 0048-examples-remove-extra-new-line-after-link-duplex.patch 2020-06-05 19:20:50.853039836 +0100 @@ -1 +1 @@ -From c81e3f21d1ea05e5123278b15d9d5e1257b6ba99 Mon Sep 17 00:00:00 2001 +From ba9c21473a48646ee1de6da01a0eb7120fabd6a9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c81e3f21d1ea05e5123278b15d9d5e1257b6ba99 ] + @@ -23 +24,0 @@ -Cc: stable@dpdk.org @@ -27 +27,0 @@ - examples/ioat/ioatfwd.c | 2 +- @@ -34 +33,0 @@ - examples/l2fwd-event/main.c | 2 +- @@ -48 +47 @@ - 21 files changed, 21 insertions(+), 21 deletions(-) + 19 files changed, 19 insertions(+), 19 deletions(-) @@ -50,11 +48,0 @@ -diff --git a/examples/ioat/ioatfwd.c b/examples/ioat/ioatfwd.c -index 7255ff3c9e..53de231795 100644 ---- a/examples/ioat/ioatfwd.c -+++ b/examples/ioat/ioatfwd.c -@@ -719,5 +719,5 @@ check_link_status(uint32_t port_mask) - portid, link.link_speed, - (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? -- ("full-duplex") : ("half-duplex\n")); -+ ("full-duplex") : ("half-duplex")); - link_status = 1; - } else @@ -62 +50 @@ -index 5eca7ba994..4afb97109f 100644 +index 68d40c19ac..0631a1a2d4 100644 @@ -65 +53 @@ -@@ -618,5 +618,5 @@ check_all_ports_link_status(uint32_t port_mask) +@@ -592,5 +592,5 @@ check_all_ports_link_status(uint32_t port_mask) @@ -73 +61 @@ -index e34d8f0e12..494d7ee776 100644 +index 17b55d4c76..d29efc5354 100644 @@ -76 +64 @@ -@@ -737,5 +737,5 @@ check_all_ports_link_status(uint32_t port_mask) +@@ -725,5 +725,5 @@ check_all_ports_link_status(uint32_t port_mask) @@ -84 +72 @@ -index 161fd218aa..f777ce2afe 100644 +index c55606e078..be77a839d3 100644 @@ -87 +75 @@ -@@ -1800,5 +1800,5 @@ check_all_ports_link_status(uint32_t port_mask) +@@ -1326,5 +1326,5 @@ check_all_ports_link_status(uint32_t port_mask) @@ -95 +83 @@ -index 1fb28513b0..7e255c35a3 100644 +index 428ca4694e..e7cb4ba566 100644 @@ -98 +86 @@ -@@ -597,5 +597,5 @@ check_all_ports_link_status(uint32_t port_mask) +@@ -599,5 +599,5 @@ check_all_ports_link_status(uint32_t port_mask) @@ -106 +94 @@ -index 29fc37e1fb..6b4ab3b5b5 100644 +index 5dff7d3b52..6c9f46e77e 100644 @@ -109 +97 @@ -@@ -684,5 +684,5 @@ check_all_ports_link_status(uint32_t port_mask) +@@ -661,5 +661,5 @@ check_all_ports_link_status(uint32_t port_mask) @@ -117 +105 @@ -index 61d78295d4..fcb55c370a 100644 +index f12fd266e6..2d79327875 100644 @@ -120 +108 @@ -@@ -1757,5 +1757,5 @@ check_all_ports_link_status(uint32_t port_mask) +@@ -1746,5 +1746,5 @@ check_all_ports_link_status(uint32_t port_mask) @@ -127,11 +114,0 @@ -diff --git a/examples/l2fwd-event/main.c b/examples/l2fwd-event/main.c -index 9cc29d7324..9593ef11e3 100644 ---- a/examples/l2fwd-event/main.c -+++ b/examples/l2fwd-event/main.c -@@ -395,5 +395,5 @@ check_all_ports_link_status(struct l2fwd_resources *rsrc, - port_id, link.link_speed, - (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? -- ("full-duplex") : ("half-duplex\n")); -+ ("full-duplex") : ("half-duplex")); - else - printf("Port %d Link Down\n", port_id); @@ -139 +116 @@ -index c1ca100ed0..396fd89db4 100644 +index a4d28e1782..8443f685d3 100644 @@ -142 +119 @@ -@@ -711,5 +711,5 @@ check_all_ports_link_status(uint32_t port_mask) +@@ -703,5 +703,5 @@ check_all_ports_link_status(uint32_t port_mask) @@ -150 +127 @@ -index 32482158d6..b7585d55e1 100644 +index 16c0a1c034..e74eb1f53e 100644 @@ -153 +130 @@ -@@ -476,5 +476,5 @@ check_all_ports_link_status(uint32_t port_mask) +@@ -468,5 +468,5 @@ check_all_ports_link_status(uint32_t port_mask) @@ -161 +138 @@ -index 88ddfe5897..f8d14b843a 100644 +index 6c23215a54..6ddf94b005 100644 @@ -164 +141 @@ -@@ -479,5 +479,5 @@ check_all_ports_link_status(uint32_t port_mask) +@@ -471,5 +471,5 @@ check_all_ports_link_status(uint32_t port_mask) @@ -172 +149 @@ -index cccf81929c..f22fca7328 100644 +index 8ed0c07ec1..f2fe20e48f 100644 @@ -175 +152 @@ -@@ -1840,5 +1840,5 @@ check_all_ports_link_status(uint32_t port_mask) +@@ -1828,5 +1828,5 @@ check_all_ports_link_status(uint32_t port_mask) @@ -183 +160 @@ -index 48b9c85e1b..9db94ce044 100644 +index 77009ce809..c2a9d36cb6 100644 @@ -186 +163 @@ -@@ -1970,5 +1970,5 @@ check_all_ports_link_status(uint32_t port_mask) +@@ -1782,5 +1782,5 @@ check_all_ports_link_status(uint32_t port_mask) @@ -194 +171 @@ -index dda430d68a..84f171f18b 100644 +index 71a67f422b..3ca84c80d9 100644 @@ -197 +174 @@ -@@ -839,5 +839,5 @@ check_all_ports_link_status(uint32_t port_mask) +@@ -721,5 +721,5 @@ check_all_ports_link_status(uint32_t port_mask) @@ -205 +182 @@ -index 38422f6ac5..25efe2b09a 100644 +index f3346d23b4..17e77427a9 100644 @@ -208 +185 @@ -@@ -501,5 +501,5 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask) +@@ -483,5 +483,5 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask) @@ -216 +193 @@ -index ad9f46f0aa..c2ec07ac65 100644 +index 1b0569937b..bf209522f8 100644 @@ -219 +196 @@ -@@ -210,5 +210,5 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask) +@@ -200,5 +200,5 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask) @@ -227 +204 @@ -index 522f211c0f..9a16e198cb 100644 +index 62771e036c..762c3cdfc7 100644 @@ -230 +207 @@ -@@ -390,5 +390,5 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask) +@@ -374,5 +374,5 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask) @@ -238 +215 @@ -index 43a5b9248d..84c1d7b3a2 100644 +index 79523d23d3..8ec819dcbe 100644 @@ -241 +218 @@ -@@ -3458,5 +3458,5 @@ check_all_ports_link_status(uint32_t port_mask) +@@ -3439,5 +3439,5 @@ check_all_ports_link_status(uint32_t port_mask) @@ -249 +226 @@ -index 0a17e0d4d5..9626c15b81 100644 +index 37c2b95fd6..8f53bafbcb 100644 @@ -252 +229 @@ -@@ -165,5 +165,5 @@ app_init_port(uint16_t portid, struct rte_mempool *mp) +@@ -154,5 +154,5 @@ app_init_port(uint16_t portid, struct rte_mempool *mp) @@ -260 +237 @@ -index 00e2e40599..378a74fa5c 100644 +index af5a18e285..ff5b08351e 100644 @@ -263 +240 @@ -@@ -273,5 +273,5 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask) +@@ -260,5 +260,5 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask) @@ -271 +248 @@ -index dc6afb132c..273bfec299 100644 +index 5fa13fe621..30f9ceb73e 100644 @@ -274 +251 @@ -@@ -273,5 +273,5 @@ check_all_ports_link_status(uint32_t port_mask) +@@ -251,5 +251,5 @@ check_all_ports_link_status(uint32_t port_mask)