From ec4954d934c67c315669eff5593a68fd402a63e8 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 28 Mar 2022 16:23:19 +0900 Subject: network: rename netdev kind virtual-wlan -> wlan The Kind= setting in [Match] section of .network files takes "wlan". This makes the same setting in .netdev files matches the one in .network files. --- man/systemd.netdev.xml | 15 +++++++-------- src/network/netdev/netdev-gperf.gperf | 6 +++--- src/network/netdev/netdev.c | 2 +- src/network/netdev/netdev.h | 2 +- src/network/netdev/wlan.c | 2 +- test/fuzz/fuzz-netdev-parser/directives.netdev | 2 +- 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml index e23146f3ca..0ba3c85521 100644 --- a/man/systemd.netdev.xml +++ b/man/systemd.netdev.xml @@ -193,8 +193,8 @@ ipoib An IP over Infiniband subinterface. - virtual-wlan - A virtual local wireless network (WLAN) interface. + wlan + A virtual wireless network (WLAN) interface. @@ -2186,17 +2186,16 @@ - [VirtualWLAN] Section Options - The [VirtualWLAN] section only applies to virtual WLAN interfaces, and accepts the following - keys: + [WLAN] Section Options + The [WLAN] section only applies to WLAN interfaces, and accepts the following keys: PhysicalDevice= - Specifies the name or index of the WLAN physical WLAN device (e.g. 0 - or phy0). The list of the physical WLAN devices that exist os the host can - be obtained by iw phy command. This option is mandatory. + Specifies the name or index of the physical WLAN device (e.g. 0 or + phy0). The list of the physical WLAN devices that exist os the host can be + obtained by iw phy command. This option is mandatory. diff --git a/src/network/netdev/netdev-gperf.gperf b/src/network/netdev/netdev-gperf.gperf index 302b8a2cf8..77140be400 100644 --- a/src/network/netdev/netdev-gperf.gperf +++ b/src/network/netdev/netdev-gperf.gperf @@ -259,6 +259,6 @@ BatmanAdvanced.RoutingAlgorithm, config_parse_batadv_routing_algorithm, IPoIB.PartitionKey, config_parse_ipoib_pkey, 0, offsetof(IPoIB, pkey) IPoIB.Mode, config_parse_ipoib_mode, 0, offsetof(IPoIB, mode) IPoIB.IgnoreUserspaceMulticastGroups, config_parse_tristate, 0, offsetof(IPoIB, umcast) -VirtualWLAN.PhysicalDevice, config_parse_wiphy, 0, 0 -VirtualWLAN.Type, config_parse_wlan_iftype, 0, offsetof(WLan, iftype) -VirtualWLAN.WDS, config_parse_tristate, 0, offsetof(WLan, wds) +WLAN.PhysicalDevice, config_parse_wiphy, 0, 0 +WLAN.Type, config_parse_wlan_iftype, 0, offsetof(WLan, iftype) +WLAN.WDS, config_parse_tristate, 0, offsetof(WLan, wds) diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c index 3d1a5e5b31..af5a0a9ffc 100644 --- a/src/network/netdev/netdev.c +++ b/src/network/netdev/netdev.c @@ -128,7 +128,7 @@ static const char* const netdev_kind_table[_NETDEV_KIND_MAX] = { [NETDEV_KIND_VXCAN] = "vxcan", [NETDEV_KIND_VXLAN] = "vxlan", [NETDEV_KIND_WIREGUARD] = "wireguard", - [NETDEV_KIND_WLAN] = "virtual-wlan", + [NETDEV_KIND_WLAN] = "wlan", [NETDEV_KIND_XFRM] = "xfrm", }; diff --git a/src/network/netdev/netdev.h b/src/network/netdev/netdev.h index 6054e322d6..1c7dc0f7e5 100644 --- a/src/network/netdev/netdev.h +++ b/src/network/netdev/netdev.h @@ -41,9 +41,9 @@ "-VRF\0" \ "-VXCAN\0" \ "-VXLAN\0" \ + "-WLAN\0" \ "-WireGuard\0" \ "-WireGuardPeer\0" \ - "-VirtualWLAN\0" \ "-Xfrm\0" typedef enum NetDevKind { diff --git a/src/network/netdev/wlan.c b/src/network/netdev/wlan.c index 17fff4d482..bf23ae3d3f 100644 --- a/src/network/netdev/wlan.c +++ b/src/network/netdev/wlan.c @@ -249,7 +249,7 @@ const NetDevVTable wlan_vtable = { .object_size = sizeof(WLan), .init = wlan_init, .done = wlan_done, - .sections = NETDEV_COMMON_SECTIONS "VirtualWLAN\0", + .sections = NETDEV_COMMON_SECTIONS "WLAN\0", .is_ready_to_create = wlan_is_ready_to_create, .create = wlan_create, .create_type = NETDEV_CREATE_INDEPENDENT, diff --git a/test/fuzz/fuzz-netdev-parser/directives.netdev b/test/fuzz/fuzz-netdev-parser/directives.netdev index 1ba273232c..d6c2e18464 100644 --- a/test/fuzz/fuzz-netdev-parser/directives.netdev +++ b/test/fuzz/fuzz-netdev-parser/directives.netdev @@ -246,7 +246,7 @@ RoutingAlgorithm= PartitionKey= Mode= IgnoreUserspaceMulticastGroups= -[VirtualWLAN] +[WLAN] PhysicalDevice= Type= WDS= -- cgit v1.2.1