From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 25 Oct 2019 12:18:23 +0000 (+0200)
Subject: Merge pull request #13623 from yuwata/network-wifi-iftype
X-Git-Tag: v244-rc1~157
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1bcefad91907e134a853430f18689b50e39ac5f7;p=thirdparty%2Fsystemd.git

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

1bcefad91907e134a853430f18689b50e39ac5f7
diff --cc man/systemd.network.xml
index c0aa8070548,d2410eca745..04cbde391e0
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@@ -153,6 -153,18 +153,18 @@@
              </para>
            </listitem>
          </varlistentry>
+         <varlistentry>
 -          <term><varname>WirelessType=</varname></term>
++          <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 00000000000,a1320e1e0c6..b909f9a6c65
mode 000000,100644..100644
--- a/network/80-wifi-adhoc.network
+++ b/network/80-wifi-adhoc.network
@@@ -1,0 -1,6 +1,6 @@@
+ [Match]
+ Type=wifi
 -WirelessType=ad-hoc
++WLANInterfaceType=ad-hoc
+ 
+ [Network]
+ LinkLocalAddressing=yes
diff --cc network/80-wifi-ap.network
index 00000000000,8d62a7a4070..6644c7e7657
mode 000000,100644..100644
--- a/network/80-wifi-ap.network
+++ b/network/80-wifi-ap.network
@@@ -1,0 -1,8 +1,8 @@@
+ [Match]
+ Type=wifi
 -WirelessType=ap
++WLANInterfaceType=ap
+ 
+ [Network]
+ Address=0.0.0.0/24
+ DHCPServer=yes
+ IPMasquerade=yes
diff --cc network/80-wifi-station.network
index 00000000000,7d4555fd75d..9268eb68dd1
mode 000000,100644..100644
--- a/network/80-wifi-station.network
+++ b/network/80-wifi-station.network
@@@ -1,0 -1,6 +1,6 @@@
+ [Match]
+ Type=wifi
 -WirelessType=station
++WLANInterfaceType=station
+ 
+ [Network]
+ DHCP=yes