From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 20 Sep 2021 21:29:29 +0000 (+0900)
Subject: network: rename wifi_iftype -> wlan_iftype
X-Git-Tag: v250-rc1~599^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=77f75f4fffd9f05224d7c5dca70560274380f2eb;p=thirdparty%2Fsystemd.git

network: rename wifi_iftype -> wlan_iftype
---

diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf
index 6168446be42..29bb5b3b739 100644
--- a/src/network/networkd-network-gperf.gperf
+++ b/src/network/networkd-network-gperf.gperf
@@ -49,7 +49,7 @@ Match.PermanentMACAddress,                   config_parse_hwaddrs,
 Match.Path,                                  config_parse_match_strv,                                  0,                             offsetof(Network, match.path)
 Match.Driver,                                config_parse_match_strv,                                  0,                             offsetof(Network, match.driver)
 Match.Type,                                  config_parse_match_strv,                                  0,                             offsetof(Network, match.iftype)
-Match.WLANInterfaceType,                     config_parse_match_strv,                                  0,                             offsetof(Network, match.wifi_iftype)
+Match.WLANInterfaceType,                     config_parse_match_strv,                                  0,                             offsetof(Network, match.wlan_iftype)
 Match.SSID,                                  config_parse_match_strv,                                  0,                             offsetof(Network, match.ssid)
 Match.BSSID,                                 config_parse_hwaddrs,                                     0,                             offsetof(Network, match.bssid)
 Match.Name,                                  config_parse_match_ifnames,                               IFNAME_VALID_ALTERNATIVE,      offsetof(Network, match.ifname)
diff --git a/src/shared/net-condition.c b/src/shared/net-condition.c
index b78077f4c4d..1da60810ee0 100644
--- a/src/shared/net-condition.c
+++ b/src/shared/net-condition.c
@@ -23,7 +23,7 @@ void net_match_clear(NetMatch *match) {
         match->iftype = strv_free(match->iftype);
         match->ifname = strv_free(match->ifname);
         match->property = strv_free(match->property);
-        match->wifi_iftype = strv_free(match->wifi_iftype);
+        match->wlan_iftype = strv_free(match->wlan_iftype);
         match->ssid = strv_free(match->ssid);
         match->bssid = set_free_free(match->bssid);
 }
@@ -39,7 +39,7 @@ bool net_match_is_empty(const NetMatch *match) {
                 strv_isempty(match->iftype) &&
                 strv_isempty(match->ifname) &&
                 strv_isempty(match->property) &&
-                strv_isempty(match->wifi_iftype) &&
+                strv_isempty(match->wlan_iftype) &&
                 strv_isempty(match->ssid) &&
                 set_isempty(match->bssid);
 }
@@ -127,7 +127,7 @@ int net_match_config(
                 unsigned short iftype,
                 const char *ifname,
                 char * const *alternative_names,
-                enum nl80211_iftype wifi_iftype,
+                enum nl80211_iftype wlan_iftype,
                 const char *ssid,
                 const struct ether_addr *bssid) {
 
@@ -178,7 +178,7 @@ int net_match_config(
         if (!net_condition_test_property(match->property, device))
                 return false;
 
-        if (!net_condition_test_strv(match->wifi_iftype, nl80211_iftype_to_string(wifi_iftype)))
+        if (!net_condition_test_strv(match->wlan_iftype, nl80211_iftype_to_string(wlan_iftype)))
                 return false;
 
         if (!net_condition_test_strv(match->ssid, ssid))
diff --git a/src/shared/net-condition.h b/src/shared/net-condition.h
index d61537e5e33..4f8e30a2716 100644
--- a/src/shared/net-condition.h
+++ b/src/shared/net-condition.h
@@ -18,7 +18,7 @@ typedef struct NetMatch {
         char **iftype;
         char **ifname;
         char **property;
-        char **wifi_iftype;
+        char **wlan_iftype;
         char **ssid;
         Set *bssid;
 } NetMatch;
@@ -35,7 +35,7 @@ int net_match_config(
                 unsigned short iftype,
                 const char *ifname,
                 char * const *alternative_names,
-                enum nl80211_iftype wifi_iftype,
+                enum nl80211_iftype wlan_iftype,
                 const char *ssid,
                 const struct ether_addr *bssid);