mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-22 09:58:01 +00:00
Code Issues Releases Wiki Activity

netdev-offload-dpdk: Clean up vlan_push action function.

Browse Source 
Rename parse_vlan_push_action() to add_vlan_push_action()
as it is inconsistent with other add/parse action functions.

Seen as it unconditionally returns 0 might as well change
to return void too.

Also, a redundant return code check is removed.

Signed-off-by: Kevin Traynor <ktraynor@redhat.com>
Reviewed-by: David Marchand <david.marchand@redhat.com>
Acked-by: Ilya Maximets <i.maximets@ovn.org>
This commit is contained in:
Kevin Traynor 2025-02-28 13:42:05 +00:00
parent 0087594118
commit b83d3f51e1
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/netdev-offload-dpdk.c
View File

@ -2075,9 +2075,9 @@ err:
return -1; return -1;
} }
static int static void
parse_vlan_push_action(struct flow_actions *actions, add_vlan_push_action(struct flow_actions *actions,
const struct ovs_action_push_vlan *vlan_push) const struct ovs_action_push_vlan *vlan_push)
{ {
struct rte_flow_action_of_push_vlan *rte_push_vlan; struct rte_flow_action_of_push_vlan *rte_push_vlan;
struct rte_flow_action_of_set_vlan_pcp *rte_vlan_pcp; struct rte_flow_action_of_set_vlan_pcp *rte_vlan_pcp;
@ -2096,7 +2096,6 @@ parse_vlan_push_action(struct flow_actions *actions,
rte_vlan_vid->vlan_vid = htons(vlan_tci_to_vid(vlan_push->vlan_tci)); rte_vlan_vid->vlan_vid = htons(vlan_tci_to_vid(vlan_push->vlan_tci));
add_flow_action(actions, RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_VID, add_flow_action(actions, RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_VID,
rte_vlan_vid); rte_vlan_vid);
return 0;
} }
static void static void
@ -2139,7 +2138,7 @@ parse_clone_actions(struct netdev *netdev,
} }
} else if (clone_type == OVS_ACTION_ATTR_PUSH_VLAN) { } else if (clone_type == OVS_ACTION_ATTR_PUSH_VLAN) {
const struct ovs_action_push_vlan *vlan = nl_attr_get(ca); const struct ovs_action_push_vlan *vlan = nl_attr_get(ca);
parse_vlan_push_action(actions, vlan); add_vlan_push_action(actions, vlan);
} else { } else {
VLOG_DBG_RL(&rl, VLOG_DBG_RL(&rl,
"Unsupported nested action inside clone(), " "Unsupported nested action inside clone(), "
@ -2233,9 +2232,7 @@ parse_flow_actions(struct netdev *netdev,
} else if (nl_attr_type(nla) == OVS_ACTION_ATTR_PUSH_VLAN) { } else if (nl_attr_type(nla) == OVS_ACTION_ATTR_PUSH_VLAN) {
const struct ovs_action_push_vlan *vlan = nl_attr_get(nla); const struct ovs_action_push_vlan *vlan = nl_attr_get(nla);
if (parse_vlan_push_action(actions, vlan)) { add_vlan_push_action(actions, vlan);
return -1;
}
} else if (nl_attr_type(nla) == OVS_ACTION_ATTR_POP_VLAN) { } else if (nl_attr_type(nla) == OVS_ACTION_ATTR_POP_VLAN) {
add_flow_action(actions, RTE_FLOW_ACTION_TYPE_OF_POP_VLAN, NULL); add_flow_action(actions, RTE_FLOW_ACTION_TYPE_OF_POP_VLAN, NULL);
} else if (nl_attr_type(nla) == OVS_ACTION_ATTR_TUNNEL_PUSH) { } else if (nl_attr_type(nla) == OVS_ACTION_ATTR_TUNNEL_PUSH) {