git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/nfp: fix multi-process PF probing
[dpdk.git]
/
drivers
/
net
/
fm10k
/
fm10k_rxtx.c
diff --git
a/drivers/net/fm10k/fm10k_rxtx.c
b/drivers/net/fm10k/fm10k_rxtx.c
index
5c31121
..
0a9a27a
100644
(file)
--- a/
drivers/net/fm10k/fm10k_rxtx.c
+++ b/
drivers/net/fm10k/fm10k_rxtx.c
@@
-4,7
+4,7
@@
#include <inttypes.h>
#include <inttypes.h>
-#include <
rte_
ethdev_driver.h>
+#include <ethdev_driver.h>
#include <rte_common.h>
#include <rte_net.h>
#include "fm10k.h"
#include <rte_common.h>
#include <rte_net.h>
#include "fm10k.h"
@@
-16,7
+16,7
@@
#define rte_packet_prefetch(p) do {} while (0)
#endif
#define rte_packet_prefetch(p) do {} while (0)
#endif
-#ifdef RTE_
LIBRTE_FM10K
_DEBUG_RX
+#ifdef RTE_
ETHDEV
_DEBUG_RX
static inline void dump_rxd(union fm10k_rx_desc *rxd)
{
PMD_RX_LOG(DEBUG, "+----------------|----------------+");
static inline void dump_rxd(union fm10k_rx_desc *rxd)
{
PMD_RX_LOG(DEBUG, "+----------------|----------------+");
@@
-115,7
+115,7
@@
fm10k_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
break;
mbuf = q->sw_ring[next_dd];
desc = q->hw_ring[next_dd];
break;
mbuf = q->sw_ring[next_dd];
desc = q->hw_ring[next_dd];
-#ifdef RTE_
LIBRTE_FM10K
_DEBUG_RX
+#ifdef RTE_
ETHDEV
_DEBUG_RX
dump_rxd(&desc);
#endif
rte_pktmbuf_pkt_len(mbuf) = desc.w.length;
dump_rxd(&desc);
#endif
rte_pktmbuf_pkt_len(mbuf) = desc.w.length;
@@
-229,7
+229,7
@@
fm10k_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
break;
mbuf = q->sw_ring[next_dd];
desc = q->hw_ring[next_dd];
break;
mbuf = q->sw_ring[next_dd];
desc = q->hw_ring[next_dd];
-#ifdef RTE_
LIBRTE_FM10K
_DEBUG_RX
+#ifdef RTE_
ETHDEV
_DEBUG_RX
dump_rxd(&desc);
#endif
dump_rxd(&desc);
#endif
@@
-611,6
+611,8
@@
static inline void tx_xmit_pkt(struct fm10k_tx_queue *q, struct rte_mbuf *mb)
/* set vlan if requested */
if (mb->ol_flags & PKT_TX_VLAN_PKT)
q->hw_ring[q->next_free].vlan = mb->vlan_tci;
/* set vlan if requested */
if (mb->ol_flags & PKT_TX_VLAN_PKT)
q->hw_ring[q->next_free].vlan = mb->vlan_tci;
+ else
+ q->hw_ring[q->next_free].vlan = 0;
q->sw_ring[q->next_free] = mb;
q->hw_ring[q->next_free].buffer_addr =
q->sw_ring[q->next_free] = mb;
q->hw_ring[q->next_free].buffer_addr =
@@
-708,7
+710,7
@@
fm10k_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
return i;
}
return i;
}
-#ifdef RTE_
LIBRTE_ETHDEV_DEBUG
+#ifdef RTE_
ETHDEV_DEBUG_TX
ret = rte_validate_tx_offload(m);
if (ret != 0) {
rte_errno = -ret;
ret = rte_validate_tx_offload(m);
if (ret != 0) {
rte_errno = -ret;