Code Review
/
deb_dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
New upstream version 17.11.1
[deb_dpdk.git]
/
drivers
/
net
/
failsafe
/
failsafe_rxtx.c
diff --git
a/drivers/net/failsafe/failsafe_rxtx.c
b/drivers/net/failsafe/failsafe_rxtx.c
index
7311421
..
178294c
100644
(file)
--- a/
drivers/net/failsafe/failsafe_rxtx.c
+++ b/
drivers/net/failsafe/failsafe_rxtx.c
@@
-43,7
+43,8
@@
fs_rx_unsafe(struct sub_device *sdev)
{
return (ETH(sdev) == NULL) ||
(ETH(sdev)->rx_pkt_burst == NULL) ||
{
return (ETH(sdev) == NULL) ||
(ETH(sdev)->rx_pkt_burst == NULL) ||
- (sdev->state != DEV_STARTED);
+ (sdev->state != DEV_STARTED) ||
+ (sdev->remove != 0);
}
static inline int
}
static inline int
@@
-110,7
+111,7
@@
failsafe_rx_burst(void *queue,
if (i == priv->subs_tail)
i = priv->subs_head;
sdev = &priv->subs[i];
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]);
continue;
sub_rxq = ETH(sdev)->data->rx_queues[rxq->qid];
FS_ATOMIC_P(rxq->refcnt[sdev->sid]);