From: Jarno Rajahalme <jarno.rajahalme@nsn.com>
Date: Thu, 18 Apr 2013 15:07:40 +0000 (+0300)
Subject: ofproto-dpif: Restore flow nw_tos in all cases.
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=88e9049134e92e7caae2a4af2e365a161c1ebb1e;p=sliver-openvswitch.git

ofproto-dpif: Restore flow nw_tos in all cases.

Signed-off-by: Jarno Rajahalme <jarno.rajahalme@nsn.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
index 3ae353286..330cd5e15 100644
--- a/ofproto/ofproto-dpif.c
+++ b/ofproto/ofproto-dpif.c
@@ -6006,7 +6006,7 @@ compose_output_action__(struct action_xlate_ctx *ctx, uint16_t ofp_port,
         odp_port = tnl_port_send(ofport->tnl_port, &ctx->flow);
         if (odp_port == OVSP_NONE) {
             xlate_report(ctx, "Tunneling decided against output");
-            return;
+            goto out; /* restore flow_nw_tos */
         }
 
         if (ctx->resubmit_stats) {
@@ -6032,6 +6032,7 @@ compose_output_action__(struct action_xlate_ctx *ctx, uint16_t ofp_port,
     ctx->nf_output_iface = ofp_port;
     ctx->flow.tunnel.tun_id = flow_tun_id;
     ctx->flow.vlan_tci = flow_vlan_tci;
+ out:
     ctx->flow.nw_tos = flow_nw_tos;
 }