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.
This commit is contained in:
Yu Watanabe
2022-03-28 23:53:12 +09:00
parent 53350c7bba
commit ec4954d934
6 changed files with 14 additions and 15 deletions
+3 -3
View File
@@ -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)
+1 -1
View File
@@ -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",
};
+1 -1
View File
@@ -41,9 +41,9 @@
"-VRF\0" \
"-VXCAN\0" \
"-VXLAN\0" \
"-WLAN\0" \
"-WireGuard\0" \
"-WireGuardPeer\0" \
"-VirtualWLAN\0" \
"-Xfrm\0"
typedef enum NetDevKind {
+1 -1
View File
@@ -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,