Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/dev/usb/usbdivar.h,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/dev/usb/usbdivar.h,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.107.4.2
retrieving revision 1.107.4.3
diff -u -p -r1.107.4.2 -r1.107.4.3
--- src/sys/dev/usb/usbdivar.h	2017/04/05 19:54:21	1.107.4.2
+++ src/sys/dev/usb/usbdivar.h	2018/08/25 14:57:35	1.107.4.3
@@ -1,4 +1,4 @@
-/*	$NetBSD: usbdivar.h,v 1.107.4.2 2017/04/05 19:54:21 snj Exp $	*/
+/*	$NetBSD: usbdivar.h,v 1.107.4.3 2018/08/25 14:57:35 martin Exp $	*/
 
 /*
  * Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
@@ -284,11 +284,8 @@ struct usbd_xfer {
 				ux_next;
 
 	void		       *ux_hcpriv;	/* private use by the HC driver */
-	uint8_t			ux_hcflags;	/* private use by the HC driver */
-#define UXFER_ABORTING	0x01	/* xfer is aborting. */
-#define UXFER_ABORTWAIT	0x02	/* abort completion is being awaited. */
-	kcondvar_t		ux_hccv;	/* private use by the HC driver */
 
+	struct usb_task		ux_aborttask;
 	struct callout		ux_callout;
 };