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/virtio: fix outdated comment
[dpdk.git]
/
drivers
/
net
/
mlx5
/
mlx5_mac.c
diff --git
a/drivers/net/mlx5/mlx5_mac.c
b/drivers/net/mlx5/mlx5_mac.c
index
7bdaa2a
..
291f772
100644
(file)
--- a/
drivers/net/mlx5/mlx5_mac.c
+++ b/
drivers/net/mlx5/mlx5_mac.c
@@
-4,7
+4,6
@@
*/
#include <stddef.h>
*/
#include <stddef.h>
-#include <assert.h>
#include <stdint.h>
#include <string.h>
#include <inttypes.h>
#include <stdint.h>
#include <string.h>
#include <inttypes.h>
@@
-27,10
+26,10
@@
#include <rte_ethdev_driver.h>
#include <rte_common.h>
#include <rte_ethdev_driver.h>
#include <rte_common.h>
+#include "mlx5_defs.h"
#include "mlx5.h"
#include "mlx5_utils.h"
#include "mlx5_rxtx.h"
#include "mlx5.h"
#include "mlx5_utils.h"
#include "mlx5_rxtx.h"
-#include "mlx5_defs.h"
/**
* Get MAC address by querying netdevice.
/**
* Get MAC address by querying netdevice.
@@
-70,12
+69,13
@@
mlx5_internal_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index)
struct mlx5_priv *priv = dev->data->dev_private;
const int vf = priv->config.vf;
struct mlx5_priv *priv = dev->data->dev_private;
const int vf = priv->config.vf;
-
assert
(index < MLX5_MAX_MAC_ADDRESSES);
+
MLX5_ASSERT
(index < MLX5_MAX_MAC_ADDRESSES);
if (rte_is_zero_ether_addr(&dev->data->mac_addrs[index]))
return;
if (vf)
if (rte_is_zero_ether_addr(&dev->data->mac_addrs[index]))
return;
if (vf)
- mlx5_nl_mac_addr_remove(dev, &dev->data->mac_addrs[index],
- index);
+ mlx5_nl_mac_addr_remove(priv->nl_socket_route,
+ mlx5_ifindex(dev), priv->mac_own,
+ &dev->data->mac_addrs[index], index);
memset(&dev->data->mac_addrs[index], 0, sizeof(struct rte_ether_addr));
}
memset(&dev->data->mac_addrs[index], 0, sizeof(struct rte_ether_addr));
}
@@
-100,7
+100,7
@@
mlx5_internal_mac_addr_add(struct rte_eth_dev *dev, struct rte_ether_addr *mac,
const int vf = priv->config.vf;
unsigned int i;
const int vf = priv->config.vf;
unsigned int i;
-
assert
(index < MLX5_MAX_MAC_ADDRESSES);
+
MLX5_ASSERT
(index < MLX5_MAX_MAC_ADDRESSES);
if (rte_is_zero_ether_addr(mac)) {
rte_errno = EINVAL;
return -rte_errno;
if (rte_is_zero_ether_addr(mac)) {
rte_errno = EINVAL;
return -rte_errno;
@@
-117,7
+117,9
@@
mlx5_internal_mac_addr_add(struct rte_eth_dev *dev, struct rte_ether_addr *mac,
return -rte_errno;
}
if (vf) {
return -rte_errno;
}
if (vf) {
- int ret = mlx5_nl_mac_addr_add(dev, mac, index);
+ int ret = mlx5_nl_mac_addr_add(priv->nl_socket_route,
+ mlx5_ifindex(dev), priv->mac_own,
+ mac, index);
if (ret)
return ret;
if (ret)
return ret;
@@
-209,8
+211,9
@@
mlx5_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr)
if (priv->master == 1) {
priv = dev->data->dev_private;
return mlx5_nl_vf_mac_addr_modify
if (priv->master == 1) {
priv = dev->data->dev_private;
return mlx5_nl_vf_mac_addr_modify
- (&rte_eth_devices[port_id],
- mac_addr, priv->representor_id);
+ (priv->nl_socket_route,
+ mlx5_ifindex(&rte_eth_devices[port_id]),
+ mac_addr, priv->representor_id);
}
}
rte_errno = -ENOTSUP;
}
}
rte_errno = -ENOTSUP;