[ovs-git] [openvswitch/ovs] 9cd793: ofproto-dpif-xlate: Fix recirculation for resubmit...

[GitHub]

  Branch: refs/heads/branch-2.4
  Home:   https://github.com/openvswitch/ovs
  Commit: 9cd7938f049ed37c18b763177ab5ef976c4c7458
      https://github.com/openvswitch/ovs/commit/9cd7938f049ed37c18b763177ab5ef976c4c7458
  Author: Ben Pfaff <blp at ovn.org>
  Date:   2016-01-25 (Mon, 25 Jan 2016)

  Changed paths:
    M ofproto/ofproto-dpif-xlate.c

  Log Message:
  -----------
  ofproto-dpif-xlate: Fix recirculation for resubmit to current table.

When recirculation defers actions for processing later, it decides
based on the actions being saved whether it needs to record the table
and cookie from which they originated.  Until now, it was thought that
this was only important for actions that send packets to the controller
(because those actions send the table ID and cookie).  This overlooked
a special case of the "resubmit" action which also depends on the
current table ID, which meant that this special case malfunctioned if
it came after recirculation.  This commit fixes the problem.

This is a backport of a fix orginally committed on master.  That fix
was able to add a test, but branch-2.4 lacks the "debug_recirc" feature
needed for the test.

Found while testing another feature under development.

Signed-off-by: Ben Pfaff <blp at ovn.org>
Acked-by: Jarno Rajahalme <jarno at ovn.org>