From f432f7f9037833d77e6e0d16c275b950e1cd8e03 Mon Sep 17 00:00:00 2001

From: Susant Sahani <ssahani@gmail.com>

Date: Sat, 20 Feb 2016 18:03:31 +0530

Subject: [PATCH] networkd: tunnel fix tunnel address

this fixes 2655

(cherry picked from commit 07dcb085893a2fe212b7e158028725876d2ab98f)

---

 src/network/networkd-netdev-tunnel.c | 12 ++++++------

 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/network/networkd-netdev-tunnel.c b/src/network/networkd-netdev-tunnel.c

index 46ff2974f4..7aaa041ba3 100644

--- a/src/network/networkd-netdev-tunnel.c

+++ b/src/network/networkd-netdev-tunnel.c

@@ -54,7 +54,7 @@ static int netdev_ipip_fill_message_create(NetDev *netdev, Link *link, sd_netlin

         assert(link);

         assert(m);

         assert(t);

-        assert(t->family == AF_INET || t->family != -1);

+        assert(IN_SET(t->family, AF_INET, AF_UNSPEC));

         r = sd_netlink_message_append_u32(m, IFLA_IPTUN_LINK, link->ifindex);

         if (r < 0)

@@ -87,7 +87,7 @@ static int netdev_sit_fill_message_create(NetDev *netdev, Link *link, sd_netlink

         assert(link);

         assert(m);

         assert(t);

-        assert(t->family == AF_INET || t->family != -1);

+        assert(IN_SET(t->family, AF_INET, AF_UNSPEC));

         r = sd_netlink_message_append_u32(m, IFLA_IPTUN_LINK, link->ifindex);

         if (r < 0)

@@ -124,7 +124,7 @@ static int netdev_gre_fill_message_create(NetDev *netdev, Link *link, sd_netlink

                 t = GRETAP(netdev);

         assert(t);

-        assert(t->family == AF_INET || t->family != -1);

+        assert(IN_SET(t->family, AF_INET, AF_UNSPEC));

         assert(link);

         assert(m);

@@ -497,7 +497,7 @@ static void ipip_init(NetDev *n) {

         assert(t);

         t->pmtudisc = true;

-        t->family = -1;

+        t->family = AF_UNSPEC;

 }

 static void sit_init(NetDev *n) {

@@ -507,7 +507,7 @@ static void sit_init(NetDev *n) {

         assert(t);

         t->pmtudisc = true;

-        t->family = -1;

+        t->family = AF_UNSPEC;

 }

 static void vti_init(NetDev *n) {

@@ -538,7 +538,7 @@ static void gre_init(NetDev *n) {

         assert(t);

         t->pmtudisc = true;

-        t->family = -1;

+        t->family = AF_UNSPEC;

 }

 static void ip6gre_init(NetDev *n) {