From: Jesse Gross <jesse@nicira.com>
Date: Thu, 1 Aug 2013 20:31:28 +0000 (-0700)
Subject: ofproto-dpif-xlate: Unmask mark when used for tunnels.
X-Git-Tag: sliver-openvswitch-2.0.90-1~33^2~48
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=8ba2ee855d7876617d38fb81886864b89307954a;p=sliver-openvswitch.git

ofproto-dpif-xlate: Unmask mark when used for tunnels.

The tunnel lookup uses the skb_mark as part of the port find process
but it isn't unmasked along with the other fields. This adds it to
the list of significant fields.

Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Justin Pettit <jpettit@nicira.com>
---

diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c
index 6f54b7669..01ce3c698 100644
--- a/ofproto/ofproto-dpif-xlate.c
+++ b/ofproto/ofproto-dpif-xlate.c
@@ -2301,6 +2301,9 @@ xlate_actions(struct xlate_in *xin, struct xlate_out *xout)
 
     if (tnl_port_should_receive(&ctx.xin->flow)) {
         memset(&wc->masks.tunnel, 0xff, sizeof wc->masks.tunnel);
+        /* skb_mark is currently used only by tunnels but that will likely
+         * change in the future. */
+        memset(&wc->masks.skb_mark, 0xff, sizeof wc->masks.skb_mark);
     }
     if (ctx.xbridge->has_netflow) {
         netflow_mask_wc(flow, wc);