From: Susant Sahani <ssahani@users.noreply.github.com>
Date: Tue, 18 Oct 2016 03:19:08 +0000 (+0530)
Subject: networkd: use proper cast to access VTI6 (#4399)
X-Git-Tag: v232~82
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=59f62519f17d7f2da81a9abcc4002497d97c7fa8;p=thirdparty%2Fsystemd.git

networkd: use proper cast to access VTI6 (#4399)

Fixes #4371.
---

diff --git a/src/network/networkd-netdev-tunnel.c b/src/network/networkd-netdev-tunnel.c
index 77a4734df86..9138ee4511c 100644
--- a/src/network/networkd-netdev-tunnel.c
+++ b/src/network/networkd-netdev-tunnel.c
@@ -201,12 +201,18 @@ static int netdev_ip6gre_fill_message_create(NetDev *netdev, Link *link, sd_netl
 }
 
 static int netdev_vti_fill_message_key(NetDev *netdev, Link *link, sd_netlink_message *m) {
-        Tunnel *t = VTI(netdev);
         uint32_t ikey, okey;
+        Tunnel *t;
         int r;
 
         assert(link);
         assert(m);
+
+        if (netdev->kind == NETDEV_KIND_VTI)
+                t = VTI(netdev);
+        else
+                t = VTI6(netdev);
+
         assert(t);
 
         if (t->key != 0)