network/netdev: remove support of netdevsim

netdevsim device creation by networkd was deprecated by
59a9ef102240adad039f58524cfa5774f9e78a7d (v246), and it does not work
since kernel v5.2:
https://github.com/torvalds/linux/commit/e05b2d141fef22cfac1928cf0eb6890e5dae4216

Now our baseline for the kernel is v5.4. Let's completely kill the
feature.

diff --git a/src/network/meson.build b/src/network/meson.build
index c6352f79c483c1bcad114e09a3ad5bf9d7c94c31..0dab9d64f2669f1ba27f2bbceced80e337a5523c 100644 (file)
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -19,7 +19,6 @@ sources = files(
         'netdev/macvlan.c',
         'netdev/netdev-util.c',
         'netdev/netdev.c',
-        'netdev/netdevsim.c',
         'netdev/nlmon.c',
         'netdev/tunnel.c',
         'netdev/tuntap.c',

diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c
index f31366de1c66d8b4d8ac3efbe7df0a0fee377560..0abd995b30f35fc3d44c191c3eb158350cb93350 100644 (file)
--- a/src/network/netdev/netdev.c
+++ b/src/network/netdev/netdev.c
@@ -27,7 +27,6 @@
 #include "macsec.h"
 #include "macvlan.h"
 #include "netdev.h"
-#include "netdevsim.h"
 #include "netif-util.h"
 #include "netlink-util.h"
 #include "network-util.h"
@@ -79,7 +78,6 @@ const NetDevVTable * const netdev_vtable[_NETDEV_KIND_MAX] = {
         [NETDEV_KIND_MACSEC]    = &macsec_vtable,
         [NETDEV_KIND_MACVLAN]   = &macvlan_vtable,
         [NETDEV_KIND_MACVTAP]   = &macvtap_vtable,
-        [NETDEV_KIND_NETDEVSIM] = &netdevsim_vtable,
         [NETDEV_KIND_NLMON]     = &nlmon_vtable,
         [NETDEV_KIND_SIT]       = &sit_vtable,
         [NETDEV_KIND_TAP]       = &tap_vtable,
@@ -121,7 +119,6 @@ static const char* const netdev_kind_table[_NETDEV_KIND_MAX] = {
         [NETDEV_KIND_MACSEC]    = "macsec",
         [NETDEV_KIND_MACVLAN]   = "macvlan",
         [NETDEV_KIND_MACVTAP]   = "macvtap",
-        [NETDEV_KIND_NETDEVSIM] = "netdevsim",
         [NETDEV_KIND_NLMON]     = "nlmon",
         [NETDEV_KIND_SIT]       = "sit",
         [NETDEV_KIND_TAP]       = "tap",

diff --git a/src/network/netdev/netdev.h b/src/network/netdev/netdev.h
index b7e1765f07fa6368a0c5b39f00a1ad44e44bdf4c..8ab546d1edf637a18968f18d260b5179029d897f 100644 (file)
--- a/src/network/netdev/netdev.h
+++ b/src/network/netdev/netdev.h
@@ -73,7 +73,6 @@ typedef enum NetDevKind {
         NETDEV_KIND_MACSEC,
         NETDEV_KIND_MACVLAN,
         NETDEV_KIND_MACVTAP,
-        NETDEV_KIND_NETDEVSIM,
         NETDEV_KIND_NLMON,
         NETDEV_KIND_SIT,
         NETDEV_KIND_TAP,

diff --git a/src/network/netdev/netdevsim.c b/src/network/netdev/netdevsim.c
deleted file mode 100644 (file)
index 59958c3..0000000
--- a/src/network/netdev/netdevsim.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1-or-later */
-
-#include <linux/if_arp.h>
-
-#include "netdevsim.h"
-
-static bool netdevsim_can_set_mac(NetDev *netdev, const struct hw_addr_data *hw_addr) {
-        return true;
-}
-
-const NetDevVTable netdevsim_vtable = {
-        .object_size = sizeof(NetDevSim),
-        .sections = NETDEV_COMMON_SECTIONS,
-        .create_type = NETDEV_CREATE_INDEPENDENT,
-        .can_set_mac = netdevsim_can_set_mac,
-        .iftype = ARPHRD_ETHER,
-        .generate_mac = true,
-};

diff --git a/src/network/netdev/netdevsim.h b/src/network/netdev/netdevsim.h
deleted file mode 100644 (file)
index 27adc59..0000000
--- a/src/network/netdev/netdevsim.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1-or-later */
-#pragma once
-
-typedef struct NetDevSim NetDevSim;
-
-#include "netdev.h"
-
-struct NetDevSim {
-        NetDev meta;
-};
-
-DEFINE_NETDEV_CAST(NETDEVSIM, NetDevSim);
-extern const NetDevVTable netdevsim_vtable;