diff options
| author | Ben Pfaff <blp@ovn.org> | 2015-12-03 13:00:38 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2015-12-04 08:18:37 -0800 |
| commit | 12d0ee08a288ef170f5fed4da59a37bec98309f8 (patch) | |
| tree | 24e6b1a1c479739f357c652fc23d1ae4ecb856a2 /lib/tnl-ports.c | |
| parent | eea429d98ad54a02af007ad63ec8e9d143a8ee45 (diff) | |
| download | openvswitch-12d0ee08a288ef170f5fed4da59a37bec98309f8.tar.gz | |
packets: Introduce in6_addr_mapped_ipv4() and use where appropriate.
This allows code to be written more naturally in some cases.
Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Thadeu Lima de Souza Cascardo <cascardo@redhat.com>
Diffstat (limited to 'lib/tnl-ports.c')
| -rw-r--r-- | lib/tnl-ports.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/tnl-ports.c b/lib/tnl-ports.c index 2d148117f..3006a8b59 100644 --- a/lib/tnl-ports.c +++ b/lib/tnl-ports.c @@ -166,8 +166,7 @@ tnl_port_map_insert(odp_port_t port, LIST_FOR_EACH(ip_dev, node, &addr_list) { if (ip_dev->addr4 != INADDR_ANY) { - struct in6_addr addr4; - in6_addr_set_mapped_ipv4(&addr4, ip_dev->addr4); + struct in6_addr addr4 = in6_addr_mapped_ipv4(ip_dev->addr4); map_insert(p->port, ip_dev->mac, &addr4, p->udp_port, p->dev_name); } @@ -226,8 +225,7 @@ tnl_port_map_delete(ovs_be16 udp_port) } LIST_FOR_EACH(ip_dev, node, &addr_list) { if (ip_dev->addr4 != INADDR_ANY) { - struct in6_addr addr4; - in6_addr_set_mapped_ipv4(&addr4, ip_dev->addr4); + struct in6_addr addr4 = in6_addr_mapped_ipv4(ip_dev->addr4); map_delete(ip_dev->mac, &addr4, udp_port); } if (ipv6_addr_is_set(&ip_dev->addr6)) { @@ -328,8 +326,7 @@ map_insert_ipdev(struct ip_device *ip_dev) LIST_FOR_EACH(p, node, &port_list) { if (ip_dev->addr4 != INADDR_ANY) { - struct in6_addr addr4; - in6_addr_set_mapped_ipv4(&addr4, ip_dev->addr4); + struct in6_addr addr4 = in6_addr_mapped_ipv4(ip_dev->addr4); map_insert(p->port, ip_dev->mac, &addr4, p->udp_port, p->dev_name); } @@ -387,8 +384,7 @@ delete_ipdev(struct ip_device *ip_dev) LIST_FOR_EACH(p, node, &port_list) { if (ip_dev->addr4 != INADDR_ANY) { - struct in6_addr addr4; - in6_addr_set_mapped_ipv4(&addr4, ip_dev->addr4); + struct in6_addr addr4 = in6_addr_mapped_ipv4(ip_dev->addr4); map_delete(ip_dev->mac, &addr4, p->udp_port); } if (ipv6_addr_is_set(&ip_dev->addr6)) { |