summaryrefslogtreecommitdiff
path: root/ofproto/ofproto-dpif.c
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2011-07-18 15:17:57 -0700
committerBen Pfaff <blp@nicira.com>2011-07-20 09:47:36 -0700
commit1fa96cf431bc0bdfd81aeab50e1344355f2fb73e (patch)
treea486680cd60e501279333f6322c5a16d95d1e661 /ofproto/ofproto-dpif.c
parentdaff3353a0dcb6db7c1468e442f95ae22d335e88 (diff)
downloadopenvswitch-1fa96cf431bc0bdfd81aeab50e1344355f2fb73e.tar.gz
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.
Diffstat (limited to 'ofproto/ofproto-dpif.c')
-rw-r--r--ofproto/ofproto-dpif.c2
1 files changed, 1 insertions, 1 deletions
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: