<p dir="ltr">The change log could use some explanation of why, e.g. a description of what bug this fixes.</p>
<div class="gmail_quote">On Jun 25, 2013 6:29 PM, "Justin Pettit" <<a href="mailto:jpettit@nicira.com">jpettit@nicira.com</a>> wrote:<br type="attribution"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Signed-off-by: Justin Pettit <<a href="mailto:jpettit@nicira.com">jpettit@nicira.com</a>><br>
---<br>
ofproto/tunnel.c | 7 +++++--<br>
1 file changed, 5 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/ofproto/tunnel.c b/ofproto/tunnel.c<br>
index dedfca8..1a39aea 100644<br>
--- a/ofproto/tunnel.c<br>
+++ b/ofproto/tunnel.c<br>
@@ -253,11 +253,14 @@ tnl_port_send(const struct tnl_port *tnl_port, struct flow *flow,<br>
wc->masks.nw_tos = 0xff;<br>
flow->tunnel.ip_tos = flow->nw_tos & IP_DSCP_MASK;<br>
} else {<br>
- /* ECN fields are always inherited. */<br>
- wc->masks.nw_tos |= IP_ECN_MASK;<br>
flow->tunnel.ip_tos = cfg->tos;<br>
}<br>
<br>
+ /* ECN fields are always inherited. */<br>
+ if (is_ip_any(flow)) {<br>
+ wc->masks.nw_tos |= IP_ECN_MASK;<br>
+ }<br>
+<br>
if ((flow->nw_tos & IP_ECN_MASK) == IP_ECN_CE) {<br>
flow->tunnel.ip_tos |= IP_ECN_ECT_0;<br>
} else {<br>
--<br>
1.7.9.5<br>
<br>
_______________________________________________<br>
dev mailing list<br>
<a href="mailto:dev@openvswitch.org">dev@openvswitch.org</a><br>
<a href="http://openvswitch.org/mailman/listinfo/dev" target="_blank">http://openvswitch.org/mailman/listinfo/dev</a><br>
</blockquote></div>