Merge pull request #13623 from yuwata/network-wifi-iftype

diff --cc man/systemd.network.xml
index c0aa80705483f83a3522a363a7d1b1e0e1771af9,d2410eca745ba5c74f718e5bf65019ed12dcfce1..04cbde391e06756e6f125ee81c2b10b9cdd57c6b
--- 1/man/systemd.network.xml
--- 2/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@@ -153,6 -153,18 +153,18 @@@
              </para>
            </listitem>
          </varlistentry>
 -          <term><varname>WirelessType=</varname></term>
+         <varlistentry>
++          <term><varname>WLANInterfaceType=</varname></term>
+           <listitem>
+             <para>A whitespace-separated list of wireless network type. Supported values are
+             <literal>ad-hoc</literal>, <literal>station</literal>, <literal>ap</literal>,
+             <literal>ap-vlan</literal>, <literal>wds</literal>, <literal>monitor</literal>,
+             <literal>mesh-point</literal>, <literal>p2p-client</literal>, <literal>p2p-go</literal>,
+             <literal>p2p-device</literal>, <literal>ocb</literal>, and <literal>nan</literal>. If the
+             list is prefixed with a "!", the test is inverted.
+             </para>
+           </listitem>
+         </varlistentry>
          <varlistentry>
            <term><varname>SSID=</varname></term>
            <listitem>

diff --cc network/80-wifi-adhoc.network
index 0000000000000000000000000000000000000000,a1320e1e0c651a21d66bfdf099e41cc565e78253..b909f9a6c65529f5f91afe03c6e77454127ea865
mode 000000,100644..100644
--- /dev/null
--- 2/network/80-wifi-adhoc.network
+++ b/network/80-wifi-adhoc.network
@@@ -1,0 -1,6 +1,6 @@@
 -WirelessType=ad-hoc
+ [Match]
+ Type=wifi
++WLANInterfaceType=ad-hoc
+ 
+ [Network]
+ LinkLocalAddressing=yes

diff --cc network/80-wifi-ap.network
index 0000000000000000000000000000000000000000,8d62a7a40708559d756e442c090f0ab4484a6a2c..6644c7e76575ef25835fbf83e097c13092431346
mode 000000,100644..100644
--- /dev/null
--- 2/network/80-wifi-ap.network
+++ b/network/80-wifi-ap.network
@@@ -1,0 -1,8 +1,8 @@@
 -WirelessType=ap
+ [Match]
+ Type=wifi
++WLANInterfaceType=ap
+ 
+ [Network]
+ Address=0.0.0.0/24
+ DHCPServer=yes
+ IPMasquerade=yes

diff --cc network/80-wifi-station.network
index 0000000000000000000000000000000000000000,7d4555fd75dc77ab9f5cddb0b3e4b846ca12fdf6..9268eb68dd12c1bf1dae63f6c7c604fbaa7384a0
mode 000000,100644..100644
--- /dev/null
--- 2/network/80-wifi-station.network
+++ b/network/80-wifi-station.network
@@@ -1,0 -1,6 +1,6 @@@
 -WirelessType=station
+ [Match]
+ Type=wifi
++WLANInterfaceType=station
+ 
+ [Network]
+ DHCP=yes