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.

diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
index e23146f3ca8f24a78f22df637d78600e1024a5e3..0ba3c8552175b0d52629f9b1a361c1148653bce5 100644 (file)
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@@ -193,8 +193,8 @@
           <row><entry><varname>ipoib</varname></entry>
           <entry>An IP over Infiniband subinterface.</entry></row>
 
-          <row><entry><varname>virtual-wlan</varname></entry>
-          <entry>A virtual local wireless network (WLAN) interface.</entry></row>
+          <row><entry><varname>wlan</varname></entry>
+          <entry>A virtual wireless network (WLAN) interface.</entry></row>
         </tbody>
       </tgroup>
     </table>
@@ -2186,17 +2186,16 @@
   </refsect1>
 
   <refsect1>
-    <title>[VirtualWLAN] Section Options</title>
-    <para>The [VirtualWLAN] section only applies to virtual WLAN interfaces, and accepts the following
-    keys:</para>
+    <title>[WLAN] Section Options</title>
+    <para>The [WLAN] section only applies to WLAN interfaces, and accepts the following keys:</para>
 
     <variablelist class='network-directives'>
       <varlistentry>
         <term><varname>PhysicalDevice=</varname></term>
         <listitem>
-          <para>Specifies the name or index of the WLAN physical WLAN device (e.g. <literal>0</literal>
-          or <literal>phy0</literal>). The list of the physical WLAN devices that exist os the host can
-          be obtained by <command>iw phy</command> command. This option is mandatory.</para>
+          <para>Specifies the name or index of the physical WLAN device (e.g. <literal>0</literal> or
+          <literal>phy0</literal>). The list of the physical WLAN devices that exist os the host can be
+          obtained by <command>iw phy</command> command. This option is mandatory.</para>
         </listitem>
       </varlistentry>
 

diff --git a/src/network/netdev/netdev-gperf.gperf b/src/network/netdev/netdev-gperf.gperf
index 302b8a2cf884999c638603d2f2cec0c551954679..77140be400c3b77fb443b6ae0a5599882dbb34d0 100644 (file)
--- 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 3d1a5e5b3107444ac8ea2a3332812b0652408749..af5a0a9ffce40a3e3ad6088c080cb95ae6a6bd12 100644 (file)
--- 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 6054e322d65d8ff27cac4834e516dfeba04e7507..1c7dc0f7e55d452c2426140ca73b710216a27f34 100644 (file)
--- 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 17fff4d4826d5c5e1ca191a4cef59a5d25760391..bf23ae3d3f6e744bf346feb43307fd9ad80a68c0 100644 (file)
--- 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 1ba273232c44512580be50c2a23e38370f770b7c..d6c2e18464e203327c0c3a5f359576c5585a3f56 100644 (file)
--- 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=