diff options
| author | Ben Pfaff <blp@nicira.com> | 2015-06-05 08:13:28 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2015-06-05 21:18:31 -0700 |
| commit | ea0797c929dc663ed443f07cd0bfc9d788d11367 (patch) | |
| tree | d27a67f0bda311eb55327a10d9f42fe4d0ec8b4d /ofproto/tunnel.h | |
| parent | 332eafce794d8c6d10474d3c802ef886a05a453c (diff) | |
| download | openvswitch-ea0797c929dc663ed443f07cd0bfc9d788d11367.tar.gz | |
ofproto-dpif: Avoid creating OpenFlow ports for duplicate tunnels.
Until now, when two tunnels had an identical configuration, both of them
were assigned OpenFlow ports, but only one of those OpenFlow ports was
functional. With this commit, only one of the two (or more) identically
configured tunnels will be assigned an OpenFlow port number.
Reported-by: Keith Holleman <hollemanietf@gmail.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Co-authored-by: Andy Zhou <azhou@nicira.com>
Signed-off-by: Andy Zhou <azhou@nicira.com>
Diffstat (limited to 'ofproto/tunnel.h')
| -rw-r--r-- | ofproto/tunnel.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ofproto/tunnel.h b/ofproto/tunnel.h index 6181762b2..b8415abb2 100644 --- a/ofproto/tunnel.h +++ b/ofproto/tunnel.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013 Nicira, Inc. +/* Copyright (c) 2013, 2015 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,8 +33,8 @@ void ofproto_tunnel_init(void); bool tnl_port_reconfigure(const struct ofport_dpif *, const struct netdev *, odp_port_t, bool native_tnl, const char name[]); -void tnl_port_add(const struct ofport_dpif *, const struct netdev *, - odp_port_t odp_port, bool native_tnl, const char name[]); +int tnl_port_add(const struct ofport_dpif *, const struct netdev *, + odp_port_t odp_port, bool native_tnl, const char name[]); void tnl_port_del(const struct ofport_dpif *); const struct ofport_dpif *tnl_port_receive(const struct flow *); |