From patchwork Fri Sep 27 00:18:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 278319 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id DBD892C00C3 for ; Fri, 27 Sep 2013 10:19:02 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750904Ab3I0ASp (ORCPT ); Thu, 26 Sep 2013 20:18:45 -0400 Received: from kirsty.vergenet.net ([202.4.237.240]:60350 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750804Ab3I0ASo (ORCPT ); Thu, 26 Sep 2013 20:18:44 -0400 Received: from ayumi.isobedori.kobe.vergenet.net (p6221-ipbfp1004kobeminato.hyogo.ocn.ne.jp [118.10.144.221]) by kirsty.vergenet.net (Postfix) with ESMTP id D310C25C01B; Fri, 27 Sep 2013 10:18:42 +1000 (EST) Received: by ayumi.isobedori.kobe.vergenet.net (Postfix, from userid 7100) id 5AE35EDE07C; Fri, 27 Sep 2013 09:18:41 +0900 (JST) From: Simon Horman To: dev@openvswitch.org, netdev@vger.kernel.org, Jesse Gross , Ben Pfaff Cc: Pravin B Shelar , Ravi K , Isaku Yamahata , Joe Stringer Subject: [PATCH v2.40 1/7] odp: Only pass vlan_tci to commit_vlan_action() Date: Fri, 27 Sep 2013 09:18:30 +0900 Message-Id: <1380241116-7661-2-git-send-email-horms@verge.net.au> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1380241116-7661-1-git-send-email-horms@verge.net.au> References: <1380241116-7661-1-git-send-email-horms@verge.net.au> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Joe Stringer 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 Signed-off-by: Simon Horman --- 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