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: add rte prefix to ether structures
[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
51c96f7
..
549ee6b
100644
(file)
--- a/
drivers/net/failsafe/failsafe_ether.c
+++ b/
drivers/net/failsafe/failsafe_ether.c
@@
-166,7
+166,7
@@
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,
ea = &dev->data->mac_addrs[i];
ret = rte_eth_dev_mac_addr_add(PORT_ID(sdev), ea,
@@
-247,9
+247,9
@@
fs_eth_dev_conf_apply(struct rte_eth_dev *dev,
DEBUG("Creating flow #%" PRIu32, i++);
flow->flows[SUB_ID(sdev)] =
rte_flow_create(PORT_ID(sdev),
DEBUG("Creating flow #%" PRIu32, i++);
flow->flows[SUB_ID(sdev)] =
rte_flow_create(PORT_ID(sdev),
-
&flow->fd->
attr,
- flow->
fd->items
,
- flow->
fd->
actions,
+
flow->rule.
attr,
+ flow->
rule.pattern
,
+ flow->
rule.
actions,
&ferror);
ret = rte_errno;
if (ret)
&ferror);
ret = rte_errno;
if (ret)
@@
-282,8
+282,7
@@
fs_dev_remove(struct sub_device *sdev)
sdev->state = DEV_PROBED;
/* fallthrough */
case DEV_PROBED:
sdev->state = DEV_PROBED;
/* fallthrough */
case DEV_PROBED:
- ret = rte_eal_hotplug_remove(sdev->bus->name,
- sdev->dev->name);
+ ret = rte_dev_remove(sdev->dev);
if (ret) {
ERROR("Bus detach failed for sub_device %u",
SUB_ID(sdev));
if (ret) {
ERROR("Bus detach failed for sub_device %u",
SUB_ID(sdev));
@@
-295,11
+294,12
@@
fs_dev_remove(struct sub_device *sdev)
case DEV_PARSED:
case DEV_UNDEFINED:
sdev->state = DEV_UNDEFINED;
case DEV_PARSED:
case DEV_UNDEFINED:
sdev->state = DEV_UNDEFINED;
+ sdev->sdev_port_id = RTE_MAX_ETHPORTS;
/* the end */
break;
}
sdev->remove = 0;
/* the end */
break;
}
sdev->remove = 0;
- failsafe_hotplug_alarm_install(
sdev->fs_dev
);
+ failsafe_hotplug_alarm_install(
fs_dev(sdev)
);
}
static void
}
static void
@@
-319,8
+319,9
@@
fs_dev_stats_save(struct sub_device *sdev)
WARN("Using latest snapshot taken before %"PRIu64" seconds.\n",
(rte_rdtsc() - timestamp) / rte_get_tsc_hz());
}
WARN("Using latest snapshot taken before %"PRIu64" seconds.\n",
(rte_rdtsc() - timestamp) / rte_get_tsc_hz());
}
- failsafe_stats_increment(&PRIV(sdev->fs_dev)->stats_accumulator,
- err ? &sdev->stats_snapshot.stats : &stats);
+ failsafe_stats_increment
+ (&PRIV(fs_dev(sdev))->stats_accumulator,
+ err ? &sdev->stats_snapshot.stats : &stats);
memset(&sdev->stats_snapshot, 0, sizeof(sdev->stats_snapshot));
}
memset(&sdev->stats_snapshot, 0, sizeof(sdev->stats_snapshot));
}
@@
-567,17
+568,17
@@
failsafe_eth_rmv_event_callback(uint16_t port_id __rte_unused,
{
struct sub_device *sdev = cb_arg;
{
struct sub_device *sdev = cb_arg;
- fs_lock(
sdev->fs_dev
, 0);
+ fs_lock(
fs_dev(sdev)
, 0);
/* Switch as soon as possible tx_dev. */
/* Switch as soon as possible tx_dev. */
- fs_switch_dev(
sdev->fs_dev
, sdev);
+ fs_switch_dev(
fs_dev(sdev)
, sdev);
/* Use safe bursts in any case. */
/* Use safe bursts in any case. */
-
set_burst_fn(sdev->fs_dev
, 1);
+
failsafe_set_burst_fn(fs_dev(sdev)
, 1);
/*
* Async removal, the sub-PMD will try to unregister
* the callback at the source of the current thread context.
*/
sdev->remove = 1;
/*
* Async removal, the sub-PMD will try to unregister
* the callback at the source of the current thread context.
*/
sdev->remove = 1;
- fs_unlock(
sdev->fs_dev
, 0);
+ fs_unlock(
fs_dev(sdev)
, 0);
return 0;
}
return 0;
}