X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-netdev.c;h=8119205dde710236e1b0cd73b648902634580239;hp=7f717171cad61c17c9fac56b919b5cd23bb1e515;hb=5d8689d749ffc50ade3d5c8598c1d3d11f5240f2;hpb=da927ba997d68401563b927f92e6e40e021a8e5c

diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c
index 7f717171c..8119205dd 100644
--- a/src/network/networkd-netdev.c
+++ b/src/network/networkd-netdev.c
@@ -35,15 +35,20 @@ const NetDevVTable * const netdev_vtable[_NETDEV_KIND_MAX] = {
         [NETDEV_KIND_BOND] = &bond_vtable,
         [NETDEV_KIND_VLAN] = &vlan_vtable,
         [NETDEV_KIND_MACVLAN] = &macvlan_vtable,
+        [NETDEV_KIND_IPVLAN] = &ipvlan_vtable,
         [NETDEV_KIND_VXLAN] = &vxlan_vtable,
         [NETDEV_KIND_IPIP] = &ipip_vtable,
         [NETDEV_KIND_GRE] = &gre_vtable,
+        [NETDEV_KIND_GRETAP] = &gretap_vtable,
+        [NETDEV_KIND_IP6GRE] = &ip6gre_vtable,
+        [NETDEV_KIND_IP6GRETAP] = &ip6gretap_vtable,
         [NETDEV_KIND_SIT] = &sit_vtable,
         [NETDEV_KIND_VTI] = &vti_vtable,
         [NETDEV_KIND_VETH] = &veth_vtable,
         [NETDEV_KIND_DUMMY] = &dummy_vtable,
         [NETDEV_KIND_TUN] = &tun_vtable,
         [NETDEV_KIND_TAP] = &tap_vtable,
+        [NETDEV_KIND_IP6TNL] = &ip6tnl_vtable,
 };
 
 static const char* const netdev_kind_table[_NETDEV_KIND_MAX] = {
@@ -51,15 +56,20 @@ static const char* const netdev_kind_table[_NETDEV_KIND_MAX] = {
         [NETDEV_KIND_BOND] = "bond",
         [NETDEV_KIND_VLAN] = "vlan",
         [NETDEV_KIND_MACVLAN] = "macvlan",
+        [NETDEV_KIND_IPVLAN] = "ipvlan",
         [NETDEV_KIND_VXLAN] = "vxlan",
         [NETDEV_KIND_IPIP] = "ipip",
         [NETDEV_KIND_GRE] = "gre",
+        [NETDEV_KIND_GRETAP] = "gretap",
+        [NETDEV_KIND_IP6GRE] = "ip6gre",
+        [NETDEV_KIND_IP6GRETAP] = "ip6gretap",
         [NETDEV_KIND_SIT] = "sit",
         [NETDEV_KIND_VETH] = "veth",
         [NETDEV_KIND_VTI] = "vti",
         [NETDEV_KIND_DUMMY] = "dummy",
         [NETDEV_KIND_TUN] = "tun",
         [NETDEV_KIND_TAP] = "tap",
+        [NETDEV_KIND_IP6TNL] = "ip6tnl",
 };
 
 DEFINE_STRING_TABLE_LOOKUP(netdev_kind, NetDevKind);
@@ -275,7 +285,7 @@ int netdev_enslave(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callbac
                 if (r < 0)
                         return r;
         } else {
-                /* the netdev is not yet read, save this request for when it is*/
+                /* the netdev is not yet read, save this request for when it is */
                 netdev_join_callback *cb;
 
                 cb = new0(netdev_join_callback, 1);
@@ -503,7 +513,7 @@ static int netdev_create(NetDev *netdev, Link *link,
                         r = sd_rtnl_message_append_u32(m, IFLA_LINK, link->ifindex);
                         if (r < 0) {
                                 log_netdev_error(netdev,
-                                                 "Colud not append IFLA_LINK attribute: %s",
+                                                 "Could not append IFLA_LINK attribute: %s",
                                                  strerror(-r));
                                 return r;
                         }
@@ -743,10 +753,8 @@ int netdev_load(Manager *manager) {
                 netdev_unref(netdev);
 
         r = conf_files_list_strv(&files, ".netdev", NULL, network_dirs);
-        if (r < 0) {
-                log_error_errno(r, "Failed to enumerate netdev files: %m");
-                return r;
-        }
+        if (r < 0)
+                return log_error_errno(r, "Failed to enumerate netdev files: %m");
 
         STRV_FOREACH_BACKWARDS(f, files) {
                 r = netdev_load_one(manager, *f);