[ovs-git] Open vSwitch: odp-util: Fix a bug in conversion between flow/mask and flow key (branch-1.11)

[dev at openvswitch.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Open vSwitch".

The branch, branch-1.11 has been updated
       via  e74f6cea952ecdb2b2f73c07a3ef3fa844fb31a5 (commit)
      from  d7bfc5ce313a4a2d76ea78e91b215d4bd8c331f0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e74f6cea952ecdb2b2f73c07a3ef3fa844fb31a5
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=e74f6cea952ecdb2b2f73c07a3ef3fa844fb31a5
Author: Guolin Yang <gyang at nicira.com>
		
odp-util: Fix a bug in conversion between flow/mask and flow key
		
In odp_flow_key_from_flow__(), when converting ICMPv6 flow/mask
to flow/mask key, we should always use flow to check for whether
ND informaition is present or not. In mask case, both type and code
field should be masked, otherwise ND fields can be masked.

This patch is an abridged version of the same patch committed on master.
This patch only contains necessary bug fix, but dropped extra protocol
sanity checks.

Signed-off-by: Guolin Yang <gyang at nicira.com>
Signed-off-by: Ben Pfaff <blp at nicira.com>


-----------------------------------------------------------------------

Summary of changes:
 lib/odp-util.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Open vSwitch