[Midnightbsd-cvs] src [8304] trunk/sys/dev/usb/net/if_ipheth.c: product agnostic match

[laffer1 at midnightbsd.org]

Revision: 8304
          http://svnweb.midnightbsd.org/src/?rev=8304
Author:   laffer1
Date:     2016-09-17 18:25:40 -0400 (Sat, 17 Sep 2016)
Log Message:
-----------
product agnostic match

Modified Paths:
--------------
    trunk/sys/dev/usb/net/if_ipheth.c

Modified: trunk/sys/dev/usb/net/if_ipheth.c
===================================================================
--- trunk/sys/dev/usb/net/if_ipheth.c	2016-09-17 22:23:58 UTC (rev 8303)
+++ trunk/sys/dev/usb/net/if_ipheth.c	2016-09-17 22:25:40 UTC (rev 8304)
@@ -116,7 +116,7 @@
 	DEVMETHOD(device_attach, ipheth_attach),
 	DEVMETHOD(device_detach, ipheth_detach),
 
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t ipheth_driver = {
@@ -149,6 +149,7 @@
     USB_IFACE_PROTOCOL(pt)
 
 static const STRUCT_USB_HOST_ID ipheth_devs[] = {
+#if 0
 	{IPHETH_ID(USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE,
 	    IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
 	    IPHETH_USBINTF_PROTO)},
@@ -167,6 +168,13 @@
 	{IPHETH_ID(USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_5,
 	    IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
 	    IPHETH_USBINTF_PROTO)},
+#else
+	/* product agnostic interface match */
+	{USB_VENDOR(USB_VENDOR_APPLE),
+	 USB_IFACE_CLASS(IPHETH_USBINTF_CLASS),
+	 USB_IFACE_SUBCLASS(IPHETH_USBINTF_SUBCLASS),
+	 USB_IFACE_PROTOCOL(IPHETH_USBINTF_PROTO)},
+#endif
 };
 
 static int