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
mbuf: remove rte_ctrlmbuf
[dpdk.git]
/
lib
/
librte_pmd_e1000
/
em_rxtx.c
diff --git
a/lib/librte_pmd_e1000/em_rxtx.c
b/lib/librte_pmd_e1000/em_rxtx.c
index
9707d6d
..
3304f50
100644
(file)
--- a/
lib/librte_pmd_e1000/em_rxtx.c
+++ b/
lib/librte_pmd_e1000/em_rxtx.c
@@
-85,7
+85,7
@@
rte_rxmbuf_alloc(struct rte_mempool *mp)
struct rte_mbuf *m;
m = __rte_mbuf_raw_alloc(mp);
struct rte_mbuf *m;
m = __rte_mbuf_raw_alloc(mp);
- __rte_mbuf_sanity_check_raw(m,
RTE_MBUF_PKT,
0);
+ __rte_mbuf_sanity_check_raw(m, 0);
return (m);
}
return (m);
}
@@
-1093,7
+1093,7
@@
ring_dma_zone_reserve(struct rte_eth_dev *dev, const char *ring_name,
const struct rte_memzone *mz;
char z_name[RTE_MEMZONE_NAMESIZE];
const struct rte_memzone *mz;
char z_name[RTE_MEMZONE_NAMESIZE];
-
rte_
snprintf(z_name, sizeof(z_name), "%s_%s_%d_%d",
+ snprintf(z_name, sizeof(z_name), "%s_%s_%d_%d",
dev->driver->pci_drv.name, ring_name, dev->data->port_id,
queue_id);
dev->driver->pci_drv.name, ring_name, dev->data->port_id,
queue_id);
@@
-1580,7
+1580,6
@@
em_alloc_rx_queue_mbufs(struct em_rx_queue *rxq)
if (mbuf == NULL) {
PMD_INIT_LOG(ERR, "RX mbuf alloc failed "
"queue_id=%hu\n", rxq->queue_id);
if (mbuf == NULL) {
PMD_INIT_LOG(ERR, "RX mbuf alloc failed "
"queue_id=%hu\n", rxq->queue_id);
- em_rx_queue_release(rxq);
return (-ENOMEM);
}
return (-ENOMEM);
}
@@
-1715,6
+1714,11
@@
eth_em_rx_init(struct rte_eth_dev *dev)
}
}
}
}
+ if (dev->data->dev_conf.rxmode.enable_scatter) {
+ dev->rx_pkt_burst = eth_em_recv_scattered_pkts;
+ dev->data->scattered_rx = 1;
+ }
+
/*
* Setup the Checksum Register.
* Receive Full-Packet Checksum Offload is mutually exclusive with RSS.
/*
* Setup the Checksum Register.
* Receive Full-Packet Checksum Offload is mutually exclusive with RSS.