[PATCH v2.40 1/7] odp: Only pass vlan_tci to commit_vlan_action()
From: Simon Horman <horms@verge.net.au>
Date: 2013-09-27 00:18:44
Subsystem:
library code, the rest · Maintainers:
Andrew Morton, Linus Torvalds
From: Joe Stringer <redacted> This allows for future patches to pass different tci values to commit_vlan_action() without passing an entire flow structure. Signed-off-by: Joe Stringer <redacted> Signed-off-by: Simon Horman <horms@verge.net.au> --- v2.36 - v2.39 * No change v2.35 * First post --- lib/odp-util.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/odp-util.c b/lib/odp-util.c
index 85256b7..0785c6a 100644
--- a/lib/odp-util.c
+++ b/lib/odp-util.c@@ -3318,10 +3318,10 @@ commit_set_ether_addr_action(const struct flow *flow, struct flow *base, } static void -commit_vlan_action(const struct flow *flow, struct flow *base, +commit_vlan_action(ovs_be16 vlan_tci, struct flow *base, struct ofpbuf *odp_actions, struct flow_wildcards *wc) { - if (base->vlan_tci == flow->vlan_tci) { + if (base->vlan_tci == vlan_tci) { return; }
@@ -3331,15 +3331,15 @@ commit_vlan_action(const struct flow *flow, struct flow *base, nl_msg_put_flag(odp_actions, OVS_ACTION_ATTR_POP_VLAN); } - if (flow->vlan_tci & htons(VLAN_CFI)) { + if (vlan_tci & htons(VLAN_CFI)) { struct ovs_action_push_vlan vlan; vlan.vlan_tpid = htons(ETH_TYPE_VLAN); - vlan.vlan_tci = flow->vlan_tci; + vlan.vlan_tci = vlan_tci; nl_msg_put_unspec(odp_actions, OVS_ACTION_ATTR_PUSH_VLAN, &vlan, sizeof vlan); } - base->vlan_tci = flow->vlan_tci; + base->vlan_tci = vlan_tci; } static void
@@ -3556,7 +3556,7 @@ commit_odp_actions(const struct flow *flow, struct flow *base, int *mpls_depth_delta) { commit_set_ether_addr_action(flow, base, odp_actions, wc); - commit_vlan_action(flow, base, odp_actions, wc); + commit_vlan_action(flow->vlan_tci, base, odp_actions, wc); commit_set_nw_action(flow, base, odp_actions, wc); commit_set_port_action(flow, base, odp_actions, wc); /* Committing MPLS actions should occur after committing nw and port
--
1.8.4