aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Gross <jesse@nicira.com>2013-08-01 13:31:28 -0700
committerJesse Gross <jesse@nicira.com>2013-08-01 19:05:39 -0700
commit59169d10e678633208bf989e4b687d750132b8ab (patch)
tree8d56a1b5f8213c32814ba976b0d31cf3bb67f202
parente2734807110ea184a7ed3423b706e9b6bf1f8319 (diff)
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>
-rw-r--r--ofproto/ofproto-dpif.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
index 01a4cd4d8..79ad711e8 100644
--- a/ofproto/ofproto-dpif.c
+++ b/ofproto/ofproto-dpif.c
@@ -7164,6 +7164,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);
}
/* Disable most wildcarding for NetFlow. */