Revert "net-util: add support for Type=ethernet"

This reverts commit 4cd1214db6cf4b262e8ce6381bc710091b375c96.

This may still be fixed in the kernel, revert this for now until
we see how it all shakes out.

diff --git a/man/systemd-networkd.service.xml b/man/systemd-networkd.service.xml
index f34471c395e56861f2d8fd0a8b520d7d405da4fd..57be3358fe9c0b79644518924e69db8ecd1c81a5 100644 (file)
--- a/man/systemd-networkd.service.xml
+++ b/man/systemd-networkd.service.xml
@@ -146,8 +146,7 @@
                                         <term><varname>Type</varname></term>
                                         <listitem>
                                                 <para>The device type, as exposed by the udev property
-                                                <literal>DEVTYPE</literal>, or <literal>ethernet</literal>
-                                                to match devices without a <literal>DEVTYPE</literal>.</para>
+                                                <literal>DEVTYPE</literal>.</para>
                                         </listitem>
                                 </varlistentry>
                                 <varlistentry>

diff --git a/man/udev.xml b/man/udev.xml
index 0bcb91139fbce7912a169b80d9512b66b3241c20..32a520e7b8c5b0be2ecb5c55bad0c39d2c4ac0c4 100644 (file)
--- a/man/udev.xml
+++ b/man/udev.xml
@@ -793,8 +793,7 @@
         <varlistentry>
           <term><varname>Type</varname></term>
           <listitem>
-            <para>The device type, as exposed by the udev property <literal>DEVTYPE</literal>, or
-            <literal>ethernet</literal> to match a device without a <literal>DEVTYPE</literal>.</para>
+            <para>The device type, as exposed by the udev property <literal>DEVTYPE</literal>.</para>
           </listitem>
         </varlistentry>
       </variablelist>

diff --git a/src/shared/net-util.c b/src/shared/net-util.c
index 85278e5de618d2efc9de816b07a4d571288783ab..8f8cfc9fdb6d7fe6ece6b9ede732c13a85ec4d95 100644 (file)
--- a/src/shared/net-util.c
+++ b/src/shared/net-util.c
@@ -49,7 +49,7 @@ bool net_match_config(const struct ether_addr *match_mac,
         if (match_driver && !streq_ptr(match_driver, dev_driver))
                 return 0;
 
-        if (match_type && !streq_ptr(match_type, dev_type) && !(streq(match_type, "ethernet") && !dev_type))
+        if (match_type && !streq_ptr(match_type, dev_type))
                 return 0;
 
         if (match_name && !streq_ptr(match_name, dev_name))