[ovs-git] Open vSwitch: datapath: Fix ovs_flow_free() ovs-lock assert. (branch-2.1)

[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-2.1 has been updated
       via  fa10709d1e2413ff1b5ad667595338041bbeb76b (commit)
      from  4366871536e3fef825f886cf917953d7a3af76ba (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 fa10709d1e2413ff1b5ad667595338041bbeb76b
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=fa10709d1e2413ff1b5ad667595338041bbeb76b
Author: Pravin B Shelar <pshelar at nicira.com>
		
datapath: Fix ovs_flow_free() ovs-lock assert.
		
ovs_flow_free() is not called under ovs-lock during packet
execute path (ovs_packet_cmd_execute()). Since packet execute
does not touch flow->mask, there is no need to take that
lock either. So move assert in case where flow->mask is checked.

Found by code inspection.

Signed-off-by: Pravin B Shelar <pshelar at nicira.com>
Acked-by: Andy Zhou <azhou at nicira.com>
Acked-by: Jesse Gross <jesse at nicira.com>


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

Summary of changes:
 datapath/flow_table.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Open vSwitch