diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-03-28 16:23:19 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-03-28 23:53:12 +0900 |
| commit | ec4954d934c67c315669eff5593a68fd402a63e8 (patch) | |
| tree | 986eb65737ac8e9642753403ca47071d8106544d /src/network/netdev | |
| parent | 53350c7bbade8c5f357aa3d1029ef9b2208ea675 (diff) | |
| download | systemd-ec4954d934c67c315669eff5593a68fd402a63e8.tar.gz | |
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.
Diffstat (limited to 'src/network/netdev')
| -rw-r--r-- | src/network/netdev/netdev-gperf.gperf | 6 | ||||
| -rw-r--r-- | src/network/netdev/netdev.c | 2 | ||||
| -rw-r--r-- | src/network/netdev/netdev.h | 2 | ||||
| -rw-r--r-- | src/network/netdev/wlan.c | 2 |
4 files changed, 6 insertions, 6 deletions
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, |