tree-wide: make sure net/if.h is included before any linux/ header

[thirdparty/systemd.git] / src / network / netdev / ipvlan.c

diff --git a/src/network/netdev/ipvlan.c b/src/network/netdev/ipvlan.c
index bd14f625deaa0a95842f75abd203c2a32dcd1d81..51ae64341db2c9c1d984b03143ad6fb0a9079873 100644 (file)
--- a/src/network/netdev/ipvlan.c
+++ b/src/network/netdev/ipvlan.c
@@ -1,6 +1,9 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+/* Make sure the net/if.h header is included before any linux/ one */
 #include <net/if.h>
+#include <netinet/in.h>
+#include <linux/if_arp.h>
 
 #include "conf-parser.h"
 #include "ipvlan.h"
@@ -12,46 +15,30 @@ DEFINE_CONFIG_PARSE_ENUM(config_parse_ipvlan_mode, ipvlan_mode, IPVlanMode, "Fai
 DEFINE_CONFIG_PARSE_ENUM(config_parse_ipvlan_flags, ipvlan_flags, IPVlanFlags, "Failed to parse ipvlan flags");
 
 static int netdev_ipvlan_fill_message_create(NetDev *netdev, Link *link, sd_netlink_message *req) {
-        IPVlan *m;
-        int r;
-
         assert(netdev);
         assert(link);
         assert(netdev->ifname);
 
-        if (netdev->kind == NETDEV_KIND_IPVLAN)
-                m = IPVLAN(netdev);
-        else
-                m = IPVTAP(netdev);
-
-        assert(m);
+        IPVlan *m = netdev->kind == NETDEV_KIND_IPVLAN ? IPVLAN(netdev) : IPVTAP(netdev);
+        int r;
 
         if (m->mode != _NETDEV_IPVLAN_MODE_INVALID) {
                 r = sd_netlink_message_append_u16(req, IFLA_IPVLAN_MODE, m->mode);
                 if (r < 0)
-                        return log_netdev_error_errno(netdev, r, "Could not append IFLA_IPVLAN_MODE attribute: %m");
+                        return r;
         }
 
         if (m->flags != _NETDEV_IPVLAN_FLAGS_INVALID) {
                 r = sd_netlink_message_append_u16(req, IFLA_IPVLAN_FLAGS, m->flags);
                 if (r < 0)
-                        return log_netdev_error_errno(netdev, r, "Could not append IFLA_IPVLAN_FLAGS attribute: %m");
+                        return r;
         }
 
         return 0;
 }
 
-static void ipvlan_init(NetDev *n) {
-        IPVlan *m;
-
-        assert(n);
-
-        if (n->kind == NETDEV_KIND_IPVLAN)
-                m = IPVLAN(n);
-        else
-                m = IPVTAP(n);
-
-        assert(m);
+static void ipvlan_init(NetDev *netdev) {
+        IPVlan *m = ASSERT_PTR(netdev)->kind == NETDEV_KIND_IPVLAN ? IPVLAN(netdev) : IPVTAP(netdev);
 
         m->mode = _NETDEV_IPVLAN_MODE_INVALID;
         m->flags = _NETDEV_IPVLAN_FLAGS_INVALID;
@@ -63,6 +50,7 @@ const NetDevVTable ipvlan_vtable = {
         .sections = NETDEV_COMMON_SECTIONS "IPVLAN\0",
         .fill_message_create = netdev_ipvlan_fill_message_create,
         .create_type = NETDEV_CREATE_STACKED,
+        .iftype = ARPHRD_ETHER,
         .generate_mac = true,
 };
 
@@ -72,20 +60,15 @@ const NetDevVTable ipvtap_vtable = {
         .sections = NETDEV_COMMON_SECTIONS "IPVTAP\0",
         .fill_message_create = netdev_ipvlan_fill_message_create,
         .create_type = NETDEV_CREATE_STACKED,
+        .iftype = ARPHRD_ETHER,
         .generate_mac = true,
 };
 
 IPVlanMode link_get_ipvlan_mode(Link *link) {
-        NetDev *netdev;
-
-        if (!streq_ptr(link->kind, "ipvlan"))
-                return _NETDEV_IPVLAN_MODE_INVALID;
-
-        if (netdev_get(link->manager, link->ifname, &netdev) < 0)
-                return _NETDEV_IPVLAN_MODE_INVALID;
+        assert(link);
 
-        if (netdev->kind != NETDEV_KIND_IPVLAN)
+        if (!link->netdev || link->netdev->kind != NETDEV_KIND_IPVLAN)
                 return _NETDEV_IPVLAN_MODE_INVALID;
 
-        return IPVLAN(netdev)->mode;
+        return IPVLAN(link->netdev)->mode;
 }