Code Review
/
deb_dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
New upstream version 18.05
[deb_dpdk.git]
/
drivers
/
net
/
failsafe
/
failsafe_flow.c
diff --git
a/drivers/net/failsafe/failsafe_flow.c
b/drivers/net/failsafe/failsafe_flow.c
index
ec8c909
..
bfe42fc
100644
(file)
--- a/
drivers/net/failsafe/failsafe_flow.c
+++ b/
drivers/net/failsafe/failsafe_flow.c
@@
-1,6
+1,6
@@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright 2017 6WIND S.A.
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright 2017 6WIND S.A.
- * Copyright 2017 Mellanox
.
+ * Copyright 2017 Mellanox
Technologies, Ltd
*/
#include <sys/queue.h>
*/
#include <sys/queue.h>
@@
-174,7
+174,7
@@
fs_flow_flush(struct rte_eth_dev *dev,
static int
fs_flow_query(struct rte_eth_dev *dev,
struct rte_flow *flow,
static int
fs_flow_query(struct rte_eth_dev *dev,
struct rte_flow *flow,
-
enum rte_flow_action_type type
,
+
const struct rte_flow_action *action
,
void *arg,
struct rte_flow_error *error)
{
void *arg,
struct rte_flow_error *error)
{
@@
-185,7
+185,7
@@
fs_flow_query(struct rte_eth_dev *dev,
if (sdev != NULL) {
int ret = rte_flow_query(PORT_ID(sdev),
flow->flows[SUB_ID(sdev)],
if (sdev != NULL) {
int ret = rte_flow_query(PORT_ID(sdev),
flow->flows[SUB_ID(sdev)],
-
type
, arg, error);
+
action
, arg, error);
if ((ret = fs_err(sdev, ret))) {
fs_unlock(dev, 0);
if ((ret = fs_err(sdev, ret))) {
fs_unlock(dev, 0);