[ovs-git] Open vSwitch: datapath: Fix build break in compat_query_flows(). (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  c31abb566dabe942ab2b530409dc807936839b63 (commit)
       via  45ca68cbadc3697ac95c53939d2877c6c2a3782e (commit)
       via  65d042a1b4e3169c44bbb0fca5f0746e04ae6a4e (commit)
      from  7956695a6c2f8fb3b69888f72a720c25af75e23b (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 c31abb566dabe942ab2b530409dc807936839b63
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=c31abb566dabe942ab2b530409dc807936839b63
Author: Ben Pfaff <blp at nicira.com>
		
datapath: Fix build break in compat_query_flows().
		
Commit a01ef04ce "datapath: Drop padding from struct odp_flow_key" removed
the "reserved" member from struct odp_flow_key but overlooked uses of that
member from 64-bit compatibility code.  This commit fixes up the problem.

Signed-off-by: Ben Pfaff <blp at nicira.com>
Acked-by: Jesse Gross <jesse at nicira.com>


commit 45ca68cbadc3697ac95c53939d2877c6c2a3782e
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=45ca68cbadc3697ac95c53939d2877c6c2a3782e
Author: Ben Pfaff <blp at nicira.com>
		
datapath: Fix typo in 64-bit compat header.
		
Commit f1588b1f "datapath: Remove implementation of port groups" added a
spurious "V" in the odp-compat.h header.  I failed to test-build that
commit on a 64-bit system and thus this broke the build on x86-64 and other
64-bit systems.

Signed-off-by: Ben Pfaff <blp at nicira.com>
Acked-by: Jesse Gross <jesse at nicira.com>


commit 65d042a1b4e3169c44bbb0fca5f0746e04ae6a4e
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=65d042a1b4e3169c44bbb0fca5f0746e04ae6a4e
Author: Hao Zheng <hzheng at nicira.com>
		
datapath: fix flow used time stats
		
This commit fixes a problem where datapath flow used stats can report
incorrent value, thus may result in flow expirations being incorrect.
This happens when a kernel jiffies rollover occurs between the last time
a flow is hit and the flow stats is queried.

Acked-by: Jesse Gross <jesse at nicira.com>

Signed-off-by: Hao Zheng <hzheng at nicira.com>


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

Summary of changes:
 datapath/datapath.c   |   55 ++++++++++++++----------------------------------
 datapath/odp-compat.h |    2 +-
 2 files changed, 17 insertions(+), 40 deletions(-)


hooks/post-receive
-- 
Open vSwitch