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/iavf: add RSS configuration for VF
[dpdk.git]
/
drivers
/
net
/
mlx4
/
mlx4_ethdev.c
diff --git
a/drivers/net/mlx4/mlx4_ethdev.c
b/drivers/net/mlx4/mlx4_ethdev.c
index
dfb24c2
..
9ff05c6
100644
(file)
--- a/
drivers/net/mlx4/mlx4_ethdev.c
+++ b/
drivers/net/mlx4/mlx4_ethdev.c
@@
-8,7
+8,6
@@
* Miscellaneous control operations for mlx4 driver.
*/
* Miscellaneous control operations for mlx4 driver.
*/
-#include <assert.h>
#include <dirent.h>
#include <errno.h>
#include <linux/ethtool.h>
#include <dirent.h>
#include <errno.h>
#include <linux/ethtool.h>
@@
-646,9
+645,8
@@
mlx4_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)
*/
max = ((priv->device_attr.max_cq > priv->device_attr.max_qp) ?
priv->device_attr.max_qp : priv->device_attr.max_cq);
*/
max = ((priv->device_attr.max_cq > priv->device_attr.max_qp) ?
priv->device_attr.max_qp : priv->device_attr.max_cq);
- /* If max >= 65535 then max = 0, max_rx_queues is uint16_t. */
- if (max >= 65535)
- max = 65535;
+ /* max_rx_queues is uint16_t. */
+ max = RTE_MIN(max, (unsigned int)UINT16_MAX);
info->max_rx_queues = max;
info->max_tx_queues = max;
info->max_mac_addrs = RTE_DIM(priv->mac);
info->max_rx_queues = max;
info->max_tx_queues = max;
info->max_mac_addrs = RTE_DIM(priv->mac);
@@
-874,7
+872,7
@@
mlx4_flow_ctrl_get(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
fc_conf->mode = RTE_FC_NONE;
ret = 0;
out:
fc_conf->mode = RTE_FC_NONE;
ret = 0;
out:
-
assert
(ret >= 0);
+
MLX4_ASSERT
(ret >= 0);
return -ret;
}
return -ret;
}
@@
-920,7
+918,7
@@
mlx4_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
}
ret = 0;
out:
}
ret = 0;
out:
-
assert
(ret >= 0);
+
MLX4_ASSERT
(ret >= 0);
return -ret;
}
return -ret;
}