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/mlx5: add C++ include guard to public header
[dpdk.git]
/
drivers
/
net
/
mlx5
/
mlx5_tx.h
diff --git
a/drivers/net/mlx5/mlx5_tx.h
b/drivers/net/mlx5/mlx5_tx.h
index
bc62998
..
099e729
100644
(file)
--- a/
drivers/net/mlx5/mlx5_tx.h
+++ b/
drivers/net/mlx5/mlx5_tx.h
@@
-1071,7
+1071,6
@@
mlx5_tx_mseg_memcpy(uint8_t *pdst,
uint8_t *psrc;
MLX5_ASSERT(len);
uint8_t *psrc;
MLX5_ASSERT(len);
- MLX5_ASSERT(must <= len);
do {
/* Allow zero length packets, must check first. */
dlen = rte_pktmbuf_data_len(loc->mbuf);
do {
/* Allow zero length packets, must check first. */
dlen = rte_pktmbuf_data_len(loc->mbuf);
@@
-1098,9
+1097,11
@@
mlx5_tx_mseg_memcpy(uint8_t *pdst,
if (diff <= rte_pktmbuf_data_len(loc->mbuf)) {
/*
* Copy only the minimal required
if (diff <= rte_pktmbuf_data_len(loc->mbuf)) {
/*
* Copy only the minimal required
- * part of the data buffer.
+ * part of the data buffer. Limit amount
+ * of data to be copied to the length of
+ * available space.
*/
*/
- len =
diff
;
+ len =
RTE_MIN(len, diff)
;
}
}
continue;
}
}
continue;