From e6282283090b479953b8c0f951977c82cc368322 Mon Sep 17 00:00:00 2001 From: Matan Azrad Date: Tue, 19 Dec 2017 17:14:27 +0000 Subject: [PATCH] net/failsafe: fix Rx safe check compiler hint failsafe_rx_burst function is used when there are no sub-devices or at least one of them has been removed, on the other hand, when all the sub-devices are present, failsafe_rx_burst_fast function is used. So it's really expected that some of the sub-devices will be unsafe for Rx burst in failsafe_rx_burst execution. Remove unlikely compiler hint from fs_rx_unsafe calling. Fixes: a46f8d584eb8 ("net/failsafe: add fail-safe PMD") Cc: stable@dpdk.org Signed-off-by: Matan Azrad Acked-by: Gaetan Rivet --- drivers/net/failsafe/failsafe_rxtx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/failsafe/failsafe_rxtx.c b/drivers/net/failsafe/failsafe_rxtx.c index 70157c8293..178294c2e3 100644 --- a/drivers/net/failsafe/failsafe_rxtx.c +++ b/drivers/net/failsafe/failsafe_rxtx.c @@ -111,7 +111,7 @@ failsafe_rx_burst(void *queue, if (i == priv->subs_tail) i = priv->subs_head; sdev = &priv->subs[i]; - if (unlikely(fs_rx_unsafe(sdev))) + if (fs_rx_unsafe(sdev)) continue; sub_rxq = ETH(sdev)->data->rx_queues[rxq->qid]; FS_ATOMIC_P(rxq->refcnt[sdev->sid]); -- 2.20.1