From: Ben Pfaff <blp@nicira.com>
Date: Mon, 18 Jul 2011 22:17:57 +0000 (-0700)
Subject: ofproto-dpif: Ignore ECN bits in OFPAT_SET_NW_TOS actions.
X-Git-Tag: v1.2.0~71
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=1fa96cf431bc0bdfd81aeab50e1344355f2fb73e;p=sliver-openvswitch.git

ofproto-dpif: Ignore ECN bits in OFPAT_SET_NW_TOS actions.

OpenFlow 1.0 doesn't say that the ECN bits in OFPAT_SET_NW_TOS actions must
be zero, but Open vSwitch ODP implementations do require that, so mask off
those bits before storing the nw_tos into the flow.
---

diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
index e50d72b6a..9d2f5ba4d 100644
--- a/ofproto/ofproto-dpif.c
+++ b/ofproto/ofproto-dpif.c
@@ -3151,7 +3151,7 @@ do_xlate_actions(const union ofp_action *in, size_t n_in,
             break;
 
         case OFPUTIL_OFPAT_SET_NW_TOS:
-            ctx->flow.nw_tos = ia->nw_tos.nw_tos;
+            ctx->flow.nw_tos = ia->nw_tos.nw_tos & IP_DSCP_MASK;
             break;
 
         case OFPUTIL_OFPAT_SET_TP_SRC: