[ovs-git] Open vSwitch: datapath: Simplify tnl_find_port(). (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  085a41cb35dc1d396cf2d5fd833696072d84c040 (commit)
       via  004cce23a6223a1fc062ff1fd3948de83742bc9c (commit)
       via  681f040ea84a4283635654c4fbe6060cd6153fd8 (commit)
      from  501f8d1fd75b316ee7fa7c039cb37110750bf5a1 (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 085a41cb35dc1d396cf2d5fd833696072d84c040
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=085a41cb35dc1d396cf2d5fd833696072d84c040
Author: Ben Pfaff <blp at nicira.com>
		
datapath: Simplify tnl_find_port().
		
It's only called when we want a best-match now, so there's no need to pass
in any flags that indicate the desired type of match.

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


commit 004cce23a6223a1fc062ff1fd3948de83742bc9c
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=004cce23a6223a1fc062ff1fd3948de83742bc9c
Author: Ben Pfaff <blp at nicira.com>
		
datapath: Avoid confusing tunnels that have different types.
		
Without this change, the following commands succeed:
    # ovs-dpctl add-if br1 gre1,type=gre,remote_ip=1.2.3.4,local_ip=2.3.4.5
    # ovs-dpctl add-if br1 gre0,type=gre,remote_ip=1.2.3.4
but if they are run in the opposite order, they fail with:
    ovs-dpctl: adding gre1 to br1 failed (File exists)

This fixes the problem.

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


commit 681f040ea84a4283635654c4fbe6060cd6153fd8
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=681f040ea84a4283635654c4fbe6060cd6153fd8
Author: Ben Pfaff <blp at nicira.com>
		
datapath: Factor out repeated tnl_vport_to_vport() calls.
		
This is a code cleanup only.

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


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

Summary of changes:
 datapath/tunnel.c       |   73 ++++++++++++++++++++--------------------------
 datapath/tunnel.h       |    1 -
 datapath/vport-capwap.c |    4 +-
 datapath/vport-gre.c    |    8 ++--
 4 files changed, 38 insertions(+), 48 deletions(-)


hooks/post-receive
-- 
Open vSwitch