summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlin Serdean <aserdean@cloudbasesolutions.com>2017-01-10 16:48:29 +0000
committerBen Pfaff <blp@ovn.org>2017-02-02 10:50:15 -0800
commit6c5695bb3643573ce4f98a6ae063b6ec2c2e8186 (patch)
tree746a27053ed185b449a71c2d1bc566890376c09d
parent6d43b84c2119410a0d6bfd27a7117d4cec4862e7 (diff)
downloadopenvswitch-6c5695bb3643573ce4f98a6ae063b6ec2c2e8186.tar.gz
datapath-windows: Allow tunnel action to modify destination port
'OvsTunnelAttrToIPv4TunnelKey' modifies 'tunkey' with the received netlink attributes(i.e. OVS_TUNNEL_KEY_ATTR_IPV4_DST). Change the order of the value assignment to reflect the values received via userspace. Signed-off-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com> Signed-off-by: Ben Pfaff <blp@ovn.org> Acked-by: Sairam Venugopal <vsairam@vmware.com>
-rw-r--r--datapath-windows/ovsext/Actions.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/datapath-windows/ovsext/Actions.c b/datapath-windows/ovsext/Actions.c
index fd952e86f..46f84bc74 100644
--- a/datapath-windows/ovsext/Actions.c
+++ b/datapath-windows/ovsext/Actions.c
@@ -1604,11 +1604,11 @@ OvsExecuteSetAction(OvsForwardingContext *ovsFwdCtx,
case OVS_KEY_ATTR_TUNNEL:
{
OvsIPv4TunnelKey tunKey;
+ tunKey.flow_hash = (uint16)(hash ? *hash : OvsHashFlow(key));
+ tunKey.dst_port = key->ipKey.l4.tpDst;
NTSTATUS convertStatus = OvsTunnelAttrToIPv4TunnelKey((PNL_ATTR)a, &tunKey);
status = SUCCEEDED(convertStatus) ? NDIS_STATUS_SUCCESS : NDIS_STATUS_FAILURE;
ASSERT(status == NDIS_STATUS_SUCCESS);
- tunKey.flow_hash = (uint16)(hash ? *hash : OvsHashFlow(key));
- tunKey.dst_port = key->ipKey.l4.tpDst;
RtlCopyMemory(&ovsFwdCtx->tunKey, &tunKey, sizeof ovsFwdCtx->tunKey);
break;
}