chiark / gitweb /
Revert "net-util: add support for Type=ethernet"
authorTom Gundersen <teg@jklm.no>
Sat, 4 Jan 2014 03:22:06 +0000 (04:22 +0100)
committerTom Gundersen <teg@jklm.no>
Sat, 4 Jan 2014 14:21:58 +0000 (15:21 +0100)
This reverts commit 4cd1214db6cf4b262e8ce6381bc710091b375c96.

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

man/systemd-networkd.service.xml
man/udev.xml
src/shared/net-util.c

index f34471c..57be335 100644 (file)
                                         <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>
index 0bcb911..32a520e 100644 (file)
         <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>
index 85278e5..8f8cfc9 100644 (file)
@@ -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))