Keep all of tunnel metadata in flow.
authorJarno Rajahalme <jarno.rajahalme@nsn.com>
Mon, 6 May 2013 11:56:16 +0000 (14:56 +0300)
committerJustin Pettit <jpettit@nicira.com>
Wed, 3 Jul 2013 03:48:12 +0000 (20:48 -0700)
commit81f2f21e369cf54c247d20d524efa68d43a48f82
treefa066f01a54bbd6f7a5e7bc34ad9ed065bc44b4a
parent8199967c72ba25d0532624650b0ef426f06063c3
Keep all of tunnel metadata in flow.

Do not clear tunnel metadata on tunnel input.

This is a backport of 4110a57 (Keep all of tunnel metadata in
flow.) to branch-1.11.  This fixes an issue with received tunnel
traffic and megaflows.  xlate_actions() calls tnl_port_should_receive()
to determine whether it should un-wildcard the tunnel fields.  Without
this commit, the original flow's tunnel information is zeroed and is
unavailable for tnl_port_should_receive()'s use to determine whether
it's a tunnel flow or not.  This resulted in some tunnel traffic
being wildcarded inappropriately.

Bug #18277.

Signed-off-by: Justin Pettit <jpettit@nicira.com>
Signed-off-by: Jarno Rajahalme <jarno.rajahalme@nsn.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
ofproto/ofproto-dpif.c
ofproto/tunnel.c