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 memory leak when reinitializing device
[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
d17b991
..
a1cb987
100644
(file)
--- a/
drivers/net/mlx5/mlx5_mac.c
+++ b/
drivers/net/mlx5/mlx5_mac.c
@@
-52,7
+52,7
@@
#endif
#include <rte_ether.h>
#endif
#include <rte_ether.h>
-#include <rte_ethdev.h>
+#include <rte_ethdev
_driver
.h>
#include <rte_common.h>
#include "mlx5.h"
#include <rte_common.h>
#include "mlx5.h"
@@
-93,11
+93,9
@@
priv_get_mac(struct priv *priv, uint8_t (*mac)[ETHER_ADDR_LEN])
void
mlx5_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index)
{
void
mlx5_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index)
{
- if (mlx5_is_secondary())
- return;
assert(index < MLX5_MAX_MAC_ADDRESSES);
memset(&dev->data->mac_addrs[index], 0, sizeof(struct ether_addr));
assert(index < MLX5_MAX_MAC_ADDRESSES);
memset(&dev->data->mac_addrs[index], 0, sizeof(struct ether_addr));
- if (!dev->data->promiscuous
&& !dev->data->all_multicast
)
+ if (!dev->data->promiscuous)
mlx5_traffic_restart(dev);
}
mlx5_traffic_restart(dev);
}
@@
-124,8
+122,6
@@
mlx5_mac_addr_add(struct rte_eth_dev *dev, struct ether_addr *mac,
int ret = 0;
(void)vmdq;
int ret = 0;
(void)vmdq;
- if (mlx5_is_secondary())
- return 0;
assert(index < MLX5_MAX_MAC_ADDRESSES);
/* First, make sure this address isn't already configured. */
for (i = 0; (i != MLX5_MAX_MAC_ADDRESSES); ++i) {
assert(index < MLX5_MAX_MAC_ADDRESSES);
/* First, make sure this address isn't already configured. */
for (i = 0; (i != MLX5_MAX_MAC_ADDRESSES); ++i) {
@@
-138,7
+134,7
@@
mlx5_mac_addr_add(struct rte_eth_dev *dev, struct ether_addr *mac,
return EADDRINUSE;
}
dev->data->mac_addrs[index] = *mac;
return EADDRINUSE;
}
dev->data->mac_addrs[index] = *mac;
- if (!dev->data->promiscuous
&& !dev->data->all_multicast
)
+ if (!dev->data->promiscuous)
mlx5_traffic_restart(dev);
return ret;
}
mlx5_traffic_restart(dev);
return ret;
}
@@
-154,8
+150,6
@@
mlx5_mac_addr_add(struct rte_eth_dev *dev, struct ether_addr *mac,
void
mlx5_mac_addr_set(struct rte_eth_dev *dev, struct ether_addr *mac_addr)
{
void
mlx5_mac_addr_set(struct rte_eth_dev *dev, struct ether_addr *mac_addr)
{
- if (mlx5_is_secondary())
- return;
DEBUG("%p: setting primary MAC address", (void *)dev);
mlx5_mac_addr_add(dev, mac_addr, 0, 0);
}
DEBUG("%p: setting primary MAC address", (void *)dev);
mlx5_mac_addr_add(dev, mac_addr, 0, 0);
}