shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-08-30 05:50:12 +03:00
Code Activity

network: rename netdev kind virtual-wlan -> wlan

Browse Source 
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.
This commit is contained in:
Yu Watanabe
2022-03-28 16:23:19 +09:00
parent 53350c7bba
commit ec4954d934
6 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
man/systemd.netdev.xml
View File

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

6
src/network/netdev/netdev-gperf.gperf
View File

@ -259,6 +259,6 @@ BatmanAdvanced.RoutingAlgorithm, config_parse_batadv_routing_algorithm,
IPoIB.PartitionKey, config_parse_ipoib_pkey, 0, offsetof(IPoIB, pkey) IPoIB.PartitionKey, config_parse_ipoib_pkey, 0, offsetof(IPoIB, pkey)
IPoIB.Mode, config_parse_ipoib_mode, 0, offsetof(IPoIB, mode) IPoIB.Mode, config_parse_ipoib_mode, 0, offsetof(IPoIB, mode)
IPoIB.IgnoreUserspaceMulticastGroups, config_parse_tristate, 0, offsetof(IPoIB, umcast) IPoIB.IgnoreUserspaceMulticastGroups, config_parse_tristate, 0, offsetof(IPoIB, umcast)
VirtualWLAN.PhysicalDevice, config_parse_wiphy, 0, 0 WLAN.PhysicalDevice, config_parse_wiphy, 0, 0
VirtualWLAN.Type, config_parse_wlan_iftype, 0, offsetof(WLan, iftype) WLAN.Type, config_parse_wlan_iftype, 0, offsetof(WLan, iftype)
VirtualWLAN.WDS, config_parse_tristate, 0, offsetof(WLan, wds) WLAN.WDS, config_parse_tristate, 0, offsetof(WLan, wds)

2
src/network/netdev/netdev.c
View File

@ -128,7 +128,7 @@ static const char* const netdev_kind_table[_NETDEV_KIND_MAX] = {
[NETDEV_KIND_VXCAN] = "vxcan", [NETDEV_KIND_VXCAN] = "vxcan",
[NETDEV_KIND_VXLAN] = "vxlan", [NETDEV_KIND_VXLAN] = "vxlan",
[NETDEV_KIND_WIREGUARD] = "wireguard", [NETDEV_KIND_WIREGUARD] = "wireguard",
[NETDEV_KIND_WLAN] = "virtual-wlan", [NETDEV_KIND_WLAN] = "wlan",
[NETDEV_KIND_XFRM] = "xfrm", [NETDEV_KIND_XFRM] = "xfrm",
}; };

2
src/network/netdev/netdev.h
View File

@ -41,9 +41,9 @@
"-VRF\0" \ "-VRF\0" \
"-VXCAN\0" \ "-VXCAN\0" \
"-VXLAN\0" \ "-VXLAN\0" \
"-WLAN\0" \
"-WireGuard\0" \ "-WireGuard\0" \
"-WireGuardPeer\0" \ "-WireGuardPeer\0" \
"-VirtualWLAN\0" \
"-Xfrm\0" "-Xfrm\0"
typedef enum NetDevKind { typedef enum NetDevKind {

2
src/network/netdev/wlan.c
View File

@ -249,7 +249,7 @@ const NetDevVTable wlan_vtable = {
.object_size = sizeof(WLan), .object_size = sizeof(WLan),
.init = wlan_init, .init = wlan_init,
.done = wlan_done, .done = wlan_done,
.sections = NETDEV_COMMON_SECTIONS "VirtualWLAN\0", .sections = NETDEV_COMMON_SECTIONS "WLAN\0",
.is_ready_to_create = wlan_is_ready_to_create, .is_ready_to_create = wlan_is_ready_to_create,
.create = wlan_create, .create = wlan_create,
.create_type = NETDEV_CREATE_INDEPENDENT, .create_type = NETDEV_CREATE_INDEPENDENT,

2
test/fuzz/fuzz-netdev-parser/directives.netdev
View File

@ -246,7 +246,7 @@ RoutingAlgorithm=
PartitionKey= PartitionKey=
Mode= Mode=
IgnoreUserspaceMulticastGroups= IgnoreUserspaceMulticastGroups=
[VirtualWLAN] [WLAN]
PhysicalDevice= PhysicalDevice=
Type= Type=
WDS= WDS=