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
ethdev: change stop operation callback to return int
[dpdk.git]
/
drivers
/
net
/
ice
/
base
/
ice_flow.c
diff --git
a/drivers/net/ice/base/ice_flow.c
b/drivers/net/ice/base/ice_flow.c
index
cd3ce82
..
de5dfb2
100644
(file)
--- a/
drivers/net/ice/base/ice_flow.c
+++ b/
drivers/net/ice/base/ice_flow.c
@@
-2715,30
+2715,30
@@
ice_flow_acl_find_scen_entry_cond(struct ice_flow_prof *prof,
}
/**
}
/**
- * ice_flow_acl_convert_to_acl_prio
r
- Convert to ACL priority
+ * ice_flow_acl_convert_to_acl_prio - Convert to ACL priority
* @p: flow priority
*/
* @p: flow priority
*/
-static enum ice_acl_entry_prio
r
-ice_flow_acl_convert_to_acl_prio
r
(enum ice_flow_priority p)
+static enum ice_acl_entry_prio
+ice_flow_acl_convert_to_acl_prio(enum ice_flow_priority p)
{
{
- enum ice_acl_entry_prio
r acl_prior
;
+ enum ice_acl_entry_prio
acl_prio
;
switch (p) {
case ICE_FLOW_PRIO_LOW:
switch (p) {
case ICE_FLOW_PRIO_LOW:
- acl_prio
r = ICE
_LOW;
+ acl_prio
= ICE_ACL_PRIO
_LOW;
break;
case ICE_FLOW_PRIO_NORMAL:
break;
case ICE_FLOW_PRIO_NORMAL:
- acl_prio
r = ICE
_NORMAL;
+ acl_prio
= ICE_ACL_PRIO
_NORMAL;
break;
case ICE_FLOW_PRIO_HIGH:
break;
case ICE_FLOW_PRIO_HIGH:
- acl_prio
r = ICE
_HIGH;
+ acl_prio
= ICE_ACL_PRIO
_HIGH;
break;
default:
break;
default:
- acl_prio
r = ICE
_NORMAL;
+ acl_prio
= ICE_ACL_PRIO
_NORMAL;
break;
}
break;
}
- return acl_prio
r
;
+ return acl_prio;
}
/**
}
/**
@@
-2878,15
+2878,15
@@
ice_flow_acl_add_scen_entry_sync(struct ice_hw *hw, struct ice_flow_prof *prof,
ICE_NONDMA_TO_NONDMA);
if (do_add_entry) {
ICE_NONDMA_TO_NONDMA);
if (do_add_entry) {
- enum ice_acl_entry_prio
r prior
;
+ enum ice_acl_entry_prio
prio
;
u8 *keys, *inverts;
u16 entry_idx;
keys = (u8 *)e->entry;
inverts = keys + (e->entry_sz / 2);
u8 *keys, *inverts;
u16 entry_idx;
keys = (u8 *)e->entry;
inverts = keys + (e->entry_sz / 2);
- prio
r = ice_flow_acl_convert_to_acl_prior
(e->priority);
+ prio
= ice_flow_acl_convert_to_acl_prio
(e->priority);
- status = ice_acl_add_entry(hw, prof->cfg.scen, prio
r
, keys,
+ status = ice_acl_add_entry(hw, prof->cfg.scen, prio, keys,
inverts, acts, e->acts_cnt,
&entry_idx);
if (status)
inverts, acts, e->acts_cnt,
&entry_idx);
if (status)
@@
-2904,7
+2904,6
@@
ice_flow_acl_add_scen_entry_sync(struct ice_hw *hw, struct ice_flow_prof *prof,
exist->acts = (struct ice_flow_action *)
ice_calloc(hw, exist->acts_cnt,
sizeof(struct ice_flow_action));
exist->acts = (struct ice_flow_action *)
ice_calloc(hw, exist->acts_cnt,
sizeof(struct ice_flow_action));
-
if (!exist->acts) {
status = ICE_ERR_NO_MEMORY;
goto out;
if (!exist->acts) {
status = ICE_ERR_NO_MEMORY;
goto out;