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 BD634A0093 for ; Tue, 19 May 2020 15:17:04 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B204D1D996; Tue, 19 May 2020 15:17:04 +0200 (CEST) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 7EF4C1D991 for ; Tue, 19 May 2020 15:17:01 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id w7so15815183wre.13 for ; Tue, 19 May 2020 06:17:01 -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=ZiuUw7razOIhsfSSmS1Jgv92FVNJYVEWo0LEkPZIxp0=; b=tdyU60LLHuYSY89X0Uvw8Nzldu+2WQJ8oDOkx+ky1LBLRYskK2uWA26HnJoZs8SRa5 f3gOmIMs7S0Or89IHT/Wbk6QyMjF6XCiXXu4In0oDD9O7STsK54kdSK72NwB2T844dSq L8qPbhZRfo6j7vN7w5hDyppVJ5UIJeBetpjnR3+CPB07rh5hmsiVDy8W+hO5tZClfXOM eqRYYbPqToMUoxj80AbkkjMVyGFEsy0PYn0BroMy7uJm7AFbAHX7tON61jKI24UR2J2K brfmSkaQN8846QEJBltQjbP3RqYORrZuOp1RHC4D0K6xX5hzibccJ9C/Hlu4WsIvsyjE fugg== 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=ZiuUw7razOIhsfSSmS1Jgv92FVNJYVEWo0LEkPZIxp0=; b=eRJWsYz5iYEy70NdvCcqs3tjFbswf8vCiJNNbMij7Yg22doeT59YU/hc1M++SSLFVK omHvEvJsoKPtTYOiz1p3SobIeeB51karN7REu58mbaf5y425d7Pvas0Cm4gftWU9EfIf NweF6933pP1/eFDae7VCrdSh9dyjW8PwmW86j2dZ84d7fBAkvpvCzwo0zgHsezLCG/s2 u8NDK9tx3l+GZvEvLkAJisLEKItuFiB5TqrQabwBv3h8a4sIzoeXIsoFPmnqo3YpSiu7 SXmoRPlafWnR+dl0eSn/HEFQxEVxjKyU0d5ur8iJ23N2NVbRsTbWBhfZTsyFIc21j5M1 FpFQ== X-Gm-Message-State: AOAM532/BK0nN2atHvky/AGzQUl+Hbkba+/hv8NfJGESxQnXyrBIkD0p eIcOdn5tkh4N7mjnqRudyOE2bpHNdCVJUyxE X-Google-Smtp-Source: ABdhPJza5OMILnuXEfrUsdeQ6ZjzlMysQdIJKxaGTluXOxcCP5GV3DYwHlrEcy6wSkMp4/5z7fjHxA== X-Received: by 2002:a5d:4447:: with SMTP id x7mr24887221wrr.424.1589894221070; Tue, 19 May 2020 06:17:01 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id b19sm4258200wmd.26.2020.05.19.06.17.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:17:00 -0700 (PDT) From: luca.boccassi@gmail.com To: Ivan Dyukov Cc: dpdk stable Date: Tue, 19 May 2020 14:05:48 +0100 Message-Id: <20200519130549.112823-213-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 'examples: remove extra new line after link duplex' 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 507cda6e23745cf900e3e2388e433447df728519 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/ioat/ioatfwd.c | 2 +- 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-event/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 +- 21 files changed, 21 insertions(+), 21 deletions(-) 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 @@ -718,7 +718,7 @@ check_link_status(uint32_t port_mask) "Port %d Link Up. Speed %u Mbps - %s\n", portid, link.link_speed, (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? - ("full-duplex") : ("half-duplex\n")); + ("full-duplex") : ("half-duplex")); link_status = 1; } else printf("Port %d Link Down\n", portid); diff --git a/examples/ip_fragmentation/main.c b/examples/ip_fragmentation/main.c index 28febf49e7..90e4d1ea4a 100644 --- a/examples/ip_fragmentation/main.c +++ b/examples/ip_fragmentation/main.c @@ -617,7 +617,7 @@ check_all_ports_link_status(uint32_t port_mask) "Port%d Link Up .Speed %u Mbps - %s\n", 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); continue; diff --git a/examples/ip_reassembly/main.c b/examples/ip_reassembly/main.c index d59e6d02ff..29b34d0710 100644 --- a/examples/ip_reassembly/main.c +++ b/examples/ip_reassembly/main.c @@ -736,7 +736,7 @@ check_all_ports_link_status(uint32_t port_mask) "Port%d Link Up. Speed %u Mbps - %s\n", 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); continue; diff --git a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-secgw/ipsec-secgw.c index 3b5aaf6832..1493be9025 100644 --- a/examples/ipsec-secgw/ipsec-secgw.c +++ b/examples/ipsec-secgw/ipsec-secgw.c @@ -1668,7 +1668,7 @@ check_all_ports_link_status(uint32_t port_mask) "Port%d Link Up - speed %u Mbps -%s\n", 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); continue; diff --git a/examples/ipv4_multicast/main.c b/examples/ipv4_multicast/main.c index 63333b5b69..09d9270aff 100644 --- a/examples/ipv4_multicast/main.c +++ b/examples/ipv4_multicast/main.c @@ -600,7 +600,7 @@ check_all_ports_link_status(uint32_t port_mask) "Port%d Link Up. Speed %u Mbps - %s\n", 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); continue; diff --git a/examples/kni/main.c b/examples/kni/main.c index 5f713e6b22..f867f5fc9b 100644 --- a/examples/kni/main.c +++ b/examples/kni/main.c @@ -679,7 +679,7 @@ check_all_ports_link_status(uint32_t port_mask) "Port%d Link Up - speed %uMbps - %s\n", 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); continue; diff --git a/examples/l2fwd-crypto/main.c b/examples/l2fwd-crypto/main.c index 61d78295d4..fcb55c370a 100644 --- a/examples/l2fwd-crypto/main.c +++ b/examples/l2fwd-crypto/main.c @@ -1756,7 +1756,7 @@ check_all_ports_link_status(uint32_t port_mask) "Port%d Link Up. Speed %u Mbps - %s\n", 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); continue; diff --git a/examples/l2fwd-event/main.c b/examples/l2fwd-event/main.c index 89a6bb9a44..384b71238f 100644 --- a/examples/l2fwd-event/main.c +++ b/examples/l2fwd-event/main.c @@ -263,7 +263,7 @@ check_all_ports_link_status(struct l2fwd_resources *rsrc, "Port%d Link Up. Speed %u Mbps - %s\n", 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); continue; diff --git a/examples/l2fwd-jobstats/main.c b/examples/l2fwd-jobstats/main.c index f975aa12d0..e0255080e2 100644 --- a/examples/l2fwd-jobstats/main.c +++ b/examples/l2fwd-jobstats/main.c @@ -710,7 +710,7 @@ check_all_ports_link_status(uint32_t port_mask) "Port%d Link Up. Speed %u Mbps - %s\n", 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); continue; diff --git a/examples/l2fwd-keepalive/main.c b/examples/l2fwd-keepalive/main.c index eda703e684..3d59e2ca90 100644 --- a/examples/l2fwd-keepalive/main.c +++ b/examples/l2fwd-keepalive/main.c @@ -475,7 +475,7 @@ check_all_ports_link_status(uint32_t port_mask) "Port%d Link Up. Speed %u Mbps - %s\n", 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); continue; diff --git a/examples/l2fwd/main.c b/examples/l2fwd/main.c index 09257aab1c..fcef232731 100644 --- a/examples/l2fwd/main.c +++ b/examples/l2fwd/main.c @@ -478,7 +478,7 @@ check_all_ports_link_status(uint32_t port_mask) "Port%d Link Up. Speed %u Mbps - %s\n", 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); continue; diff --git a/examples/l3fwd-acl/main.c b/examples/l3fwd-acl/main.c index fa92a28297..cfbeee962b 100644 --- a/examples/l3fwd-acl/main.c +++ b/examples/l3fwd-acl/main.c @@ -1839,7 +1839,7 @@ check_all_ports_link_status(uint32_t port_mask) "Port%d Link Up. Speed %u Mbps %s\n", 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); continue; diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c index e9b2cb5b30..aa6ff2627b 100644 --- a/examples/l3fwd-power/main.c +++ b/examples/l3fwd-power/main.c @@ -1998,7 +1998,7 @@ check_all_ports_link_status(uint32_t port_mask) "Mbps - %s\n", (uint8_t)portid, (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", (uint8_t)portid); diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c index 4dea12a653..3a8ec5a7f2 100644 --- a/examples/l3fwd/main.c +++ b/examples/l3fwd/main.c @@ -747,7 +747,7 @@ check_all_ports_link_status(uint32_t port_mask) "Port%d Link Up. Speed %u Mbps -%s\n", 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); continue; diff --git a/examples/link_status_interrupt/main.c b/examples/link_status_interrupt/main.c index a924aa2313..72f86e502f 100644 --- a/examples/link_status_interrupt/main.c +++ b/examples/link_status_interrupt/main.c @@ -500,7 +500,7 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask) "Port%d Link Up. Speed %u Mbps - %s\n", 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); continue; 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 ad9f46f0aa..c2ec07ac65 100644 --- a/examples/multi_process/client_server_mp/mp_server/init.c +++ b/examples/multi_process/client_server_mp/mp_server/init.c @@ -209,7 +209,7 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask) "Mbps - %s\n", ports->id[portid], (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", (uint8_t)ports->id[portid]); diff --git a/examples/multi_process/symmetric_mp/main.c b/examples/multi_process/symmetric_mp/main.c index 7f491452a7..c5cd8825e5 100644 --- a/examples/multi_process/symmetric_mp/main.c +++ b/examples/multi_process/symmetric_mp/main.c @@ -389,7 +389,7 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask) "Port%d Link Up. Speed %u Mbps - %s\n", 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); continue; diff --git a/examples/performance-thread/l3fwd-thread/main.c b/examples/performance-thread/l3fwd-thread/main.c index ad540fd842..f58a70b77f 100644 --- a/examples/performance-thread/l3fwd-thread/main.c +++ b/examples/performance-thread/l3fwd-thread/main.c @@ -3457,7 +3457,7 @@ check_all_ports_link_status(uint32_t port_mask) "Port%d Link Up. Speed %u Mbps - %s\n", 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); continue; diff --git a/examples/qos_sched/init.c b/examples/qos_sched/init.c index 0a17e0d4d5..9626c15b81 100644 --- a/examples/qos_sched/init.c +++ b/examples/qos_sched/init.c @@ -164,7 +164,7 @@ app_init_port(uint16_t portid, struct rte_mempool *mp) printf(" Link Up - speed %u Mbps - %s\n", (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 00e2e40599..378a74fa5c 100644 --- a/examples/server_node_efd/server/init.c +++ b/examples/server_node_efd/server/init.c @@ -272,7 +272,7 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask) info->id[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", info->id[portid]); diff --git a/examples/vm_power_manager/main.c b/examples/vm_power_manager/main.c index d39f044c1e..0409a832b5 100644 --- a/examples/vm_power_manager/main.c +++ b/examples/vm_power_manager/main.c @@ -272,7 +272,7 @@ check_all_ports_link_status(uint32_t port_mask) "Mbps - %s\n", (uint16_t)portid, (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", (uint16_t)portid); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:53.283606344 +0100 +++ 0213-examples-remove-extra-new-line-after-link-duplex.patch 2020-05-19 14:04:44.632655913 +0100 @@ -1,8 +1,10 @@ -From c81e3f21d1ea05e5123278b15d9d5e1257b6ba99 Mon Sep 17 00:00:00 2001 +From 507cda6e23745cf900e3e2388e433447df728519 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") @@ -20,7 +22,6 @@ Fixes: de3cfa2c98 ("sched: initial import") Fixes: d7937e2e3d ("power: initial import") Fixes: 3fc5ca2f63 ("kni: initial import") -Cc: stable@dpdk.org Signed-off-by: Ivan Dyukov --- @@ -61,7 +62,7 @@ } else printf("Port %d Link Down\n", portid); diff --git a/examples/ip_fragmentation/main.c b/examples/ip_fragmentation/main.c -index 5eca7ba994..4afb97109f 100644 +index 28febf49e7..90e4d1ea4a 100644 --- a/examples/ip_fragmentation/main.c +++ b/examples/ip_fragmentation/main.c @@ -617,7 +617,7 @@ check_all_ports_link_status(uint32_t port_mask) @@ -74,7 +75,7 @@ printf("Port %d Link Down\n", portid); continue; diff --git a/examples/ip_reassembly/main.c b/examples/ip_reassembly/main.c -index e34d8f0e12..494d7ee776 100644 +index d59e6d02ff..29b34d0710 100644 --- a/examples/ip_reassembly/main.c +++ b/examples/ip_reassembly/main.c @@ -736,7 +736,7 @@ check_all_ports_link_status(uint32_t port_mask) @@ -87,10 +88,10 @@ printf("Port %d Link Down\n", portid); continue; diff --git a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-secgw/ipsec-secgw.c -index 161fd218aa..f777ce2afe 100644 +index 3b5aaf6832..1493be9025 100644 --- a/examples/ipsec-secgw/ipsec-secgw.c +++ b/examples/ipsec-secgw/ipsec-secgw.c -@@ -1799,7 +1799,7 @@ check_all_ports_link_status(uint32_t port_mask) +@@ -1668,7 +1668,7 @@ check_all_ports_link_status(uint32_t port_mask) "Port%d Link Up - speed %u Mbps -%s\n", portid, link.link_speed, (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? @@ -100,10 +101,10 @@ printf("Port %d Link Down\n", portid); continue; diff --git a/examples/ipv4_multicast/main.c b/examples/ipv4_multicast/main.c -index 1fb28513b0..7e255c35a3 100644 +index 63333b5b69..09d9270aff 100644 --- a/examples/ipv4_multicast/main.c +++ b/examples/ipv4_multicast/main.c -@@ -596,7 +596,7 @@ check_all_ports_link_status(uint32_t port_mask) +@@ -600,7 +600,7 @@ check_all_ports_link_status(uint32_t port_mask) "Port%d Link Up. Speed %u Mbps - %s\n", portid, link.link_speed, (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? @@ -113,10 +114,10 @@ printf("Port %d Link Down\n", portid); continue; diff --git a/examples/kni/main.c b/examples/kni/main.c -index 29fc37e1fb..6b4ab3b5b5 100644 +index 5f713e6b22..f867f5fc9b 100644 --- a/examples/kni/main.c +++ b/examples/kni/main.c -@@ -683,7 +683,7 @@ check_all_ports_link_status(uint32_t port_mask) +@@ -679,7 +679,7 @@ check_all_ports_link_status(uint32_t port_mask) "Port%d Link Up - speed %uMbps - %s\n", portid, link.link_speed, (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? @@ -139,10 +140,10 @@ printf("Port %d Link Down\n", portid); continue; diff --git a/examples/l2fwd-event/main.c b/examples/l2fwd-event/main.c -index 9cc29d7324..9593ef11e3 100644 +index 89a6bb9a44..384b71238f 100644 --- a/examples/l2fwd-event/main.c +++ b/examples/l2fwd-event/main.c -@@ -394,7 +394,7 @@ check_all_ports_link_status(struct l2fwd_resources *rsrc, +@@ -263,7 +263,7 @@ check_all_ports_link_status(struct l2fwd_resources *rsrc, "Port%d Link Up. Speed %u Mbps - %s\n", port_id, link.link_speed, (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? @@ -152,7 +153,7 @@ printf("Port %d Link Down\n", port_id); continue; diff --git a/examples/l2fwd-jobstats/main.c b/examples/l2fwd-jobstats/main.c -index c1ca100ed0..396fd89db4 100644 +index f975aa12d0..e0255080e2 100644 --- a/examples/l2fwd-jobstats/main.c +++ b/examples/l2fwd-jobstats/main.c @@ -710,7 +710,7 @@ check_all_ports_link_status(uint32_t port_mask) @@ -165,7 +166,7 @@ printf("Port %d Link Down\n", portid); continue; diff --git a/examples/l2fwd-keepalive/main.c b/examples/l2fwd-keepalive/main.c -index 32482158d6..b7585d55e1 100644 +index eda703e684..3d59e2ca90 100644 --- a/examples/l2fwd-keepalive/main.c +++ b/examples/l2fwd-keepalive/main.c @@ -475,7 +475,7 @@ check_all_ports_link_status(uint32_t port_mask) @@ -178,7 +179,7 @@ printf("Port %d Link Down\n", portid); continue; diff --git a/examples/l2fwd/main.c b/examples/l2fwd/main.c -index 88ddfe5897..f8d14b843a 100644 +index 09257aab1c..fcef232731 100644 --- a/examples/l2fwd/main.c +++ b/examples/l2fwd/main.c @@ -478,7 +478,7 @@ check_all_ports_link_status(uint32_t port_mask) @@ -191,7 +192,7 @@ printf("Port %d Link Down\n", portid); continue; diff --git a/examples/l3fwd-acl/main.c b/examples/l3fwd-acl/main.c -index cccf81929c..f22fca7328 100644 +index fa92a28297..cfbeee962b 100644 --- a/examples/l3fwd-acl/main.c +++ b/examples/l3fwd-acl/main.c @@ -1839,7 +1839,7 @@ check_all_ports_link_status(uint32_t port_mask) @@ -204,10 +205,10 @@ printf("Port %d Link Down\n", portid); continue; diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c -index 48b9c85e1b..9db94ce044 100644 +index e9b2cb5b30..aa6ff2627b 100644 --- a/examples/l3fwd-power/main.c +++ b/examples/l3fwd-power/main.c -@@ -1969,7 +1969,7 @@ check_all_ports_link_status(uint32_t port_mask) +@@ -1998,7 +1998,7 @@ check_all_ports_link_status(uint32_t port_mask) "Mbps - %s\n", (uint8_t)portid, (unsigned)link.link_speed, (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? @@ -217,10 +218,10 @@ printf("Port %d Link Down\n", (uint8_t)portid); diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c -index dda430d68a..84f171f18b 100644 +index 4dea12a653..3a8ec5a7f2 100644 --- a/examples/l3fwd/main.c +++ b/examples/l3fwd/main.c -@@ -838,7 +838,7 @@ check_all_ports_link_status(uint32_t port_mask) +@@ -747,7 +747,7 @@ check_all_ports_link_status(uint32_t port_mask) "Port%d Link Up. Speed %u Mbps -%s\n", portid, link.link_speed, (link.link_duplex == ETH_LINK_FULL_DUPLEX) ? @@ -230,7 +231,7 @@ printf("Port %d Link Down\n", portid); continue; diff --git a/examples/link_status_interrupt/main.c b/examples/link_status_interrupt/main.c -index 38422f6ac5..25efe2b09a 100644 +index a924aa2313..72f86e502f 100644 --- a/examples/link_status_interrupt/main.c +++ b/examples/link_status_interrupt/main.c @@ -500,7 +500,7 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask) @@ -256,7 +257,7 @@ printf("Port %d Link Down\n", (uint8_t)ports->id[portid]); diff --git a/examples/multi_process/symmetric_mp/main.c b/examples/multi_process/symmetric_mp/main.c -index 522f211c0f..9a16e198cb 100644 +index 7f491452a7..c5cd8825e5 100644 --- a/examples/multi_process/symmetric_mp/main.c +++ b/examples/multi_process/symmetric_mp/main.c @@ -389,7 +389,7 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask) @@ -269,7 +270,7 @@ printf("Port %d Link Down\n", portid); continue; diff --git a/examples/performance-thread/l3fwd-thread/main.c b/examples/performance-thread/l3fwd-thread/main.c -index 43a5b9248d..84c1d7b3a2 100644 +index ad540fd842..f58a70b77f 100644 --- a/examples/performance-thread/l3fwd-thread/main.c +++ b/examples/performance-thread/l3fwd-thread/main.c @@ -3457,7 +3457,7 @@ check_all_ports_link_status(uint32_t port_mask) @@ -308,7 +309,7 @@ printf("Port %d Link Down\n", info->id[portid]); diff --git a/examples/vm_power_manager/main.c b/examples/vm_power_manager/main.c -index dc6afb132c..273bfec299 100644 +index d39f044c1e..0409a832b5 100644 --- a/examples/vm_power_manager/main.c +++ b/examples/vm_power_manager/main.c @@ -272,7 +272,7 @@ check_all_ports_link_status(uint32_t port_mask)