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

[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, master has been updated
       via  6f8dbd272a7d1b4a0f5d8cd58467c162ae65135e (commit)
      from  1805ee4b4d7c7a5be00bf57e97d885f8285ede59 (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 6f8dbd272a7d1b4a0f5d8cd58467c162ae65135e
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=6f8dbd272a7d1b4a0f5d8cd58467c162ae65135e
Author: Guolin Yang <gyang at nicira.com>
		
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.

Similarly in reverse conversion (parse_l2_5_onward()), we should
have same check.

Signed-off-by: Guolin Yang <gyang at nicira.com>
[blp at nicira.com changed && to || in parse_l2_5_onward()
Signed-off-by: Ben Pfaff <blp at nicira.com>
Acked-by: Andy Zhou <azhou at nicira.com>


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

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


hooks/post-receive
-- 
Open vSwitch