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/e1000: fix i219 hang on reset/close
[dpdk.git]
/
drivers
/
net
/
failsafe
/
failsafe_ether.c
diff --git
a/drivers/net/failsafe/failsafe_ether.c
b/drivers/net/failsafe/failsafe_ether.c
index
7ac23d4
..
504c76e
100644
(file)
--- a/
drivers/net/failsafe/failsafe_ether.c
+++ b/
drivers/net/failsafe/failsafe_ether.c
@@
-166,15
+166,16
@@
fs_eth_dev_conf_apply(struct rte_eth_dev *dev,
DEBUG("Configure additional MAC address%s",
(PRIV(dev)->nb_mac_addr > 2 ? "es" : ""));
for (i = 1; i < PRIV(dev)->nb_mac_addr; i++) {
DEBUG("Configure additional MAC address%s",
(PRIV(dev)->nb_mac_addr > 2 ? "es" : ""));
for (i = 1; i < PRIV(dev)->nb_mac_addr; i++) {
- struct ether_addr *ea;
+ struct
rte_
ether_addr *ea;
ea = &dev->data->mac_addrs[i];
ret = rte_eth_dev_mac_addr_add(PORT_ID(sdev), ea,
PRIV(dev)->mac_addr_pool[i]);
if (ret) {
ea = &dev->data->mac_addrs[i];
ret = rte_eth_dev_mac_addr_add(PORT_ID(sdev), ea,
PRIV(dev)->mac_addr_pool[i]);
if (ret) {
- char ea_fmt[ETHER_ADDR_FMT_SIZE];
+ char ea_fmt[
RTE_
ETHER_ADDR_FMT_SIZE];
- ether_format_addr(ea_fmt, ETHER_ADDR_FMT_SIZE, ea);
+ rte_ether_format_addr(ea_fmt,
+ RTE_ETHER_ADDR_FMT_SIZE, ea);
ERROR("Adding MAC address %s failed", ea_fmt);
return ret;
}
ERROR("Adding MAC address %s failed", ea_fmt);
return ret;
}
@@
-283,7
+284,7
@@
fs_dev_remove(struct sub_device *sdev)
/* fallthrough */
case DEV_PROBED:
ret = rte_dev_remove(sdev->dev);
/* fallthrough */
case DEV_PROBED:
ret = rte_dev_remove(sdev->dev);
- if (ret) {
+ if (ret
< 0
) {
ERROR("Bus detach failed for sub_device %u",
SUB_ID(sdev));
} else {
ERROR("Bus detach failed for sub_device %u",
SUB_ID(sdev));
} else {