From: Jean Tourrilhes <jt@hpl.hp.com>
Date: Thu, 28 Oct 2010 16:56:37 +0000 (-0700)
Subject: ofp-util: Fix normalization of IP TOS bits.
X-Git-Tag: v1.1.0~967
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=371e4acc87f79bcf5a28420a61e4c35291727e0f;p=sliver-openvswitch.git

ofp-util: Fix normalization of IP TOS bits.

If the packet is not IP, you probably want to also wildcard the ToS.
---

diff --git a/lib/ofp-util.c b/lib/ofp-util.c
index 99e5943c5..05c6f5467 100644
--- a/lib/ofp-util.c
+++ b/lib/ofp-util.c
@@ -711,7 +711,8 @@ actions_next(struct actions_iterator *iter)
 void
 normalize_match(struct ofp_match *m)
 {
-    enum { OFPFW_NW = OFPFW_NW_SRC_MASK | OFPFW_NW_DST_MASK | OFPFW_NW_PROTO };
+    enum { OFPFW_NW = (OFPFW_NW_SRC_MASK | OFPFW_NW_DST_MASK | OFPFW_NW_PROTO
+                       | OFPFW_NW_TOS) };
     enum { OFPFW_TP = OFPFW_TP_SRC | OFPFW_TP_DST };
     uint32_t wc;