Module Name:    src
Committed By:   snj
Date:           Mon Feb 19 19:33:06 UTC 2018

Modified Files:
        src/sys/dev/usb [netbsd-7]: if_athn_usb.c if_atu.c if_aue.c if_axe.c
            if_axen.c if_cdce.c if_cue.c if_kue.c if_otus.c if_rum.c if_run.c
            if_smsc.c if_udav.c if_upgt.c if_upl.c if_ural.c if_url.c
            if_urndis.c if_urtw.c if_urtwn.c if_zyd.c irmce.c pseye.c ubt.c
            ucom.c udsir.c ugen.c uhso.c uirda.c ulpt.c umass.c umidi.c
            uscanner.c usscanner.c ustir.c utoppy.c uvideo.c

Log Message:
Pull up following revision(s) (requested by skrll in ticket #1556):
        sys/dev/usb/if_athn_usb.c: 1.25
        sys/dev/usb/if_atu.c: 1.56
        sys/dev/usb/if_aue.c: 1.142
        sys/dev/usb/if_axe.c: 1.84
        sys/dev/usb/if_axen.c: 1.12
        sys/dev/usb/if_cdce.c: 1.45
        sys/dev/usb/if_cue.c: 1.77
        sys/dev/usb/if_kue.c: 1.91
        sys/dev/usb/if_otus.c: 1.32
        sys/dev/usb/if_rum.c: 1.59
        sys/dev/usb/if_run.c: 1.25
        sys/dev/usb/if_smsc.c: 1.33
        sys/dev/usb/if_udav.c: 1.52
        sys/dev/usb/if_upgt.c: 1.18
        sys/dev/usb/if_upl.c: 1.61
        sys/dev/usb/if_ural.c: 1.53
        sys/dev/usb/if_url.c: 1.57
        sys/dev/usb/if_urndis.c: 1.17
        sys/dev/usb/if_urtw.c: 1.14
        sys/dev/usb/if_urtwn.c: 1.56
        sys/dev/usb/if_zyd.c: 1.45
        sys/dev/usb/irmce.c: 1.4
        sys/dev/usb/pseye.c: 1.24
        sys/dev/usb/ubt.c: 1.60
        sys/dev/usb/ucom.c: 1.120
        sys/dev/usb/udsir.c: 1.6
        sys/dev/usb/ugen.c: 1.137
        sys/dev/usb/uhso.c: 1.27
        sys/dev/usb/uirda.c: 1.43
        sys/dev/usb/ulpt.c: 1.99
        sys/dev/usb/umass.c: 1.163
        sys/dev/usb/umidi.c: 1.74
        sys/dev/usb/uscanner.c: 1.82
        sys/dev/usb/usscanner.c: 1.43
        sys/dev/usb/ustir.c: 1.39
        sys/dev/usb/utoppy.c: 1.30
        sys/dev/usb/uvideo.c: 1.46
PR kern/52931 Kernel panics with Atheros usb wireless interface
Audit the flags to usbd_create_xfer so that USBD_FORCE_SHORT_XFER is
supplied wherever such a transfer is setup.  We can drop
USBD_SHORT_XFER_OK as it has not bearing on number of TDs


To generate a diff of this commit:
cvs rdiff -u -r1.6.6.2 -r1.6.6.3 src/sys/dev/usb/if_athn_usb.c
cvs rdiff -u -r1.49.10.1 -r1.49.10.2 src/sys/dev/usb/if_atu.c
cvs rdiff -u -r1.132.2.1 -r1.132.2.2 src/sys/dev/usb/if_aue.c
cvs rdiff -u -r1.67.2.2 -r1.67.2.3 src/sys/dev/usb/if_axe.c
cvs rdiff -u -r1.3.2.2 -r1.3.2.3 src/sys/dev/usb/if_axen.c
cvs rdiff -u -r1.38.12.1 -r1.38.12.2 src/sys/dev/usb/if_cdce.c
cvs rdiff -u -r1.68.2.1 -r1.68.2.2 src/sys/dev/usb/if_cue.c
cvs rdiff -u -r1.81.2.1 -r1.81.2.2 src/sys/dev/usb/if_kue.c
cvs rdiff -u -r1.25.4.1 -r1.25.4.2 src/sys/dev/usb/if_otus.c
cvs rdiff -u -r1.48.4.1 -r1.48.4.2 src/sys/dev/usb/if_rum.c
cvs rdiff -u -r1.10.4.2 -r1.10.4.3 src/sys/dev/usb/if_run.c
cvs rdiff -u -r1.19.2.3 -r1.19.2.4 src/sys/dev/usb/if_smsc.c
cvs rdiff -u -r1.43.2.1 -r1.43.2.2 src/sys/dev/usb/if_udav.c
cvs rdiff -u -r1.12.2.1 -r1.12.2.2 src/sys/dev/usb/if_upgt.c
cvs rdiff -u -r1.47.2.1 -r1.47.2.2 src/sys/dev/usb/if_upl.c
cvs rdiff -u -r1.44.12.2 -r1.44.12.3 src/sys/dev/usb/if_ural.c
cvs rdiff -u -r1.48.2.1 -r1.48.2.2 src/sys/dev/usb/if_url.c
cvs rdiff -u -r1.9.2.1 -r1.9.2.2 src/sys/dev/usb/if_urndis.c
cvs rdiff -u -r1.6.4.1 -r1.6.4.2 src/sys/dev/usb/if_urtw.c
cvs rdiff -u -r1.34.2.2 -r1.34.2.3 src/sys/dev/usb/if_urtwn.c
cvs rdiff -u -r1.36.12.1 -r1.36.12.2 src/sys/dev/usb/if_zyd.c
cvs rdiff -u -r1.1.30.1 -r1.1.30.2 src/sys/dev/usb/irmce.c
cvs rdiff -u -r1.21.32.1 -r1.21.32.2 src/sys/dev/usb/pseye.c
cvs rdiff -u -r1.51.2.1 -r1.51.2.2 src/sys/dev/usb/ubt.c
cvs rdiff -u -r1.107.2.2 -r1.107.2.3 src/sys/dev/usb/ucom.c
cvs rdiff -u -r1.1.12.1 -r1.1.12.2 src/sys/dev/usb/udsir.c
cvs rdiff -u -r1.124.2.3 -r1.124.2.4 src/sys/dev/usb/ugen.c
cvs rdiff -u -r1.16.2.1 -r1.16.2.2 src/sys/dev/usb/uhso.c
cvs rdiff -u -r1.38.4.1 -r1.38.4.2 src/sys/dev/usb/uirda.c \
    src/sys/dev/usb/usscanner.c
cvs rdiff -u -r1.95.2.1 -r1.95.2.2 src/sys/dev/usb/ulpt.c
cvs rdiff -u -r1.148.4.1 -r1.148.4.2 src/sys/dev/usb/umass.c
cvs rdiff -u -r1.65.12.2 -r1.65.12.3 src/sys/dev/usb/umidi.c
cvs rdiff -u -r1.75.2.1 -r1.75.2.2 src/sys/dev/usb/uscanner.c
cvs rdiff -u -r1.33.8.1 -r1.33.8.2 src/sys/dev/usb/ustir.c
cvs rdiff -u -r1.24.2.1 -r1.24.2.2 src/sys/dev/usb/utoppy.c
cvs rdiff -u -r1.40.4.1 -r1.40.4.2 src/sys/dev/usb/uvideo.c

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

Modified files:

Index: src/sys/dev/usb/if_athn_usb.c
diff -u src/sys/dev/usb/if_athn_usb.c:1.6.6.2 src/sys/dev/usb/if_athn_usb.c:1.6.6.3
--- src/sys/dev/usb/if_athn_usb.c:1.6.6.2	Mon Oct 23 19:15:09 2017
+++ src/sys/dev/usb/if_athn_usb.c	Mon Feb 19 19:33:06 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_athn_usb.c,v 1.6.6.2 2017/10/23 19:15:09 snj Exp $	*/
+/*	$NetBSD: if_athn_usb.c,v 1.6.6.3 2018/02/19 19:33:06 snj Exp $	*/
 /*	$OpenBSD: if_athn_usb.c,v 1.12 2013/01/14 09:50:31 jsing Exp $	*/
 
 /*-
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_athn_usb.c,v 1.6.6.2 2017/10/23 19:15:09 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_athn_usb.c,v 1.6.6.3 2018/02/19 19:33:06 snj Exp $");
 
 #ifdef	_KERNEL_OPT
 #include "opt_inet.h"
@@ -675,7 +675,7 @@ athn_usb_alloc_rx_list(struct athn_usb_s
 		data->sc = usc;	/* Backpointer for callbacks. */
 
 		error = usbd_create_xfer(usc->usc_rx_data_pipe,
-		    ATHN_USB_RXBUFSZ, USBD_SHORT_XFER_OK, 0, &data->xfer);
+		    ATHN_USB_RXBUFSZ, 0, 0, &data->xfer);
 		if (error) {
 			aprint_error_dev(usc->usc_dev,
 			    "could not allocate xfer\n");
@@ -722,7 +722,7 @@ athn_usb_alloc_tx_list(struct athn_usb_s
 		data->sc = usc;	/* Backpointer for callbacks. */
 
 		error = usbd_create_xfer(usc->usc_tx_data_pipe,
-		    ATHN_USB_TXBUFSZ, USBD_SHORT_XFER_OK, 0, &data->xfer);
+		    ATHN_USB_TXBUFSZ, USBD_FORCE_SHORT_XFER, 0, &data->xfer);
 		if (error) {
 			aprint_error_dev(usc->usc_dev,
 			    "could not create xfer on TX pipe\n");

Index: src/sys/dev/usb/if_atu.c
diff -u src/sys/dev/usb/if_atu.c:1.49.10.1 src/sys/dev/usb/if_atu.c:1.49.10.2
--- src/sys/dev/usb/if_atu.c:1.49.10.1	Wed Apr  5 19:54:19 2017
+++ src/sys/dev/usb/if_atu.c	Mon Feb 19 19:33:06 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_atu.c,v 1.49.10.1 2017/04/05 19:54:19 snj Exp $ */
+/*	$NetBSD: if_atu.c,v 1.49.10.2 2018/02/19 19:33:06 snj Exp $ */
 /*	$OpenBSD: if_atu.c,v 1.48 2004/12/30 01:53:21 dlg Exp $ */
 /*
  * Copyright (c) 2003, 2004
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.49.10.1 2017/04/05 19:54:19 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.49.10.2 2018/02/19 19:33:06 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -317,7 +317,7 @@ atu_usb_request(struct atu_softc *sc, ui
 	s = splnet();
 
 	struct usbd_pipe *pipe0 = usbd_get_pipe0(sc->atu_udev);
-	int error = usbd_create_xfer(pipe0, length, USBD_SHORT_XFER_OK, 0,
+	int error = usbd_create_xfer(pipe0, length, 0, 0,
 	    &xfer);
 	if (error) {
 		splx(s);
@@ -1560,7 +1560,7 @@ atu_rx_list_init(struct atu_softc *sc)
 		c->atu_idx = i;
 		if (c->atu_xfer == NULL) {
 			int err = usbd_create_xfer(sc->atu_ep[ATU_ENDPT_RX],
-			    ATU_RX_BUFSZ, USBD_SHORT_XFER_OK, 0, &c->atu_xfer);
+			    ATU_RX_BUFSZ, 0, 0, &c->atu_xfer);
 			if (err)
 				return err;
 			c->atu_buf = usbd_get_buffer(c->atu_xfer);

Index: src/sys/dev/usb/if_aue.c
diff -u src/sys/dev/usb/if_aue.c:1.132.2.1 src/sys/dev/usb/if_aue.c:1.132.2.2
--- src/sys/dev/usb/if_aue.c:1.132.2.1	Wed Apr  5 19:54:19 2017
+++ src/sys/dev/usb/if_aue.c	Mon Feb 19 19:33:06 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_aue.c,v 1.132.2.1 2017/04/05 19:54:19 snj Exp $	*/
+/*	$NetBSD: if_aue.c,v 1.132.2.2 2018/02/19 19:33:06 snj Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.132.2.1 2017/04/05 19:54:19 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.132.2.2 2018/02/19 19:33:06 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -1012,7 +1012,7 @@ aue_rx_list_init(struct aue_softc *sc)
 			return ENOBUFS;
 		if (c->aue_xfer == NULL) {
 			int err = usbd_create_xfer(sc->aue_ep[AUE_ENDPT_RX],
-			    AUE_BUFSZ, USBD_SHORT_XFER_OK, 0, &c->aue_xfer);
+			    AUE_BUFSZ, 0, 0, &c->aue_xfer);
 			if (err) {
 				return err;
 			}

Index: src/sys/dev/usb/if_axe.c
diff -u src/sys/dev/usb/if_axe.c:1.67.2.2 src/sys/dev/usb/if_axe.c:1.67.2.3
--- src/sys/dev/usb/if_axe.c:1.67.2.2	Wed Apr  5 19:54:19 2017
+++ src/sys/dev/usb/if_axe.c	Mon Feb 19 19:33:06 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_axe.c,v 1.67.2.2 2017/04/05 19:54:19 snj Exp $	*/
+/*	$NetBSD: if_axe.c,v 1.67.2.3 2018/02/19 19:33:06 snj Exp $	*/
 /*	$OpenBSD: if_axe.c,v 1.137 2016/04/13 11:03:37 mpi Exp $ */
 
 /*
@@ -87,7 +87,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.67.2.2 2017/04/05 19:54:19 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.67.2.3 2018/02/19 19:33:06 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1199,7 +1199,7 @@ axe_rx_list_init(struct axe_softc *sc)
 		c->axe_idx = i;
 		if (c->axe_xfer == NULL) {
 			int err = usbd_create_xfer(sc->axe_ep[AXE_ENDPT_RX],
-			    sc->axe_bufsz, USBD_SHORT_XFER_OK, 0, &c->axe_xfer);
+			    sc->axe_bufsz, 0, 0, &c->axe_xfer);
 			if (err)
 				return err;
 			c->axe_buf = usbd_get_buffer(c->axe_xfer);

Index: src/sys/dev/usb/if_axen.c
diff -u src/sys/dev/usb/if_axen.c:1.3.2.2 src/sys/dev/usb/if_axen.c:1.3.2.3
--- src/sys/dev/usb/if_axen.c:1.3.2.2	Wed Apr  5 19:54:19 2017
+++ src/sys/dev/usb/if_axen.c	Mon Feb 19 19:33:06 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_axen.c,v 1.3.2.2 2017/04/05 19:54:19 snj Exp $	*/
+/*	$NetBSD: if_axen.c,v 1.3.2.3 2018/02/19 19:33:06 snj Exp $	*/
 /*	$OpenBSD: if_axen.c,v 1.3 2013/10/21 10:10:22 yuo Exp $	*/
 
 /*
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_axen.c,v 1.3.2.2 2017/04/05 19:54:19 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axen.c,v 1.3.2.3 2018/02/19 19:33:06 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -932,8 +932,7 @@ axen_rx_list_init(struct axen_softc *sc)
 		c->axen_idx = i;
 		if (c->axen_xfer == NULL) {
 			int err = usbd_create_xfer(sc->axen_ep[AXEN_ENDPT_RX],
-			    sc->axen_bufsz, USBD_SHORT_XFER_OK, 0,
-			    &c->axen_xfer);
+			    sc->axen_bufsz, 0, 0, &c->axen_xfer);
 			if (err)
 				return err;
 			c->axen_buf = usbd_get_buffer(c->axen_xfer);

Index: src/sys/dev/usb/if_cdce.c
diff -u src/sys/dev/usb/if_cdce.c:1.38.12.1 src/sys/dev/usb/if_cdce.c:1.38.12.2
--- src/sys/dev/usb/if_cdce.c:1.38.12.1	Wed Apr  5 19:54:19 2017
+++ src/sys/dev/usb/if_cdce.c	Mon Feb 19 19:33:06 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_cdce.c,v 1.38.12.1 2017/04/05 19:54:19 snj Exp $ */
+/*	$NetBSD: if_cdce.c,v 1.38.12.2 2018/02/19 19:33:06 snj Exp $ */
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wp...@windriver.com>
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.38.12.1 2017/04/05 19:54:19 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.38.12.2 2018/02/19 19:33:06 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -607,7 +607,7 @@ cdce_rx_list_init(struct cdce_softc *sc)
 			return ENOBUFS;
 		if (c->cdce_xfer == NULL) {
 			int err = usbd_create_xfer(sc->cdce_bulkin_pipe,
-			    CDCE_BUFSZ, USBD_SHORT_XFER_OK, 0, &c->cdce_xfer);
+			    CDCE_BUFSZ, 0, 0, &c->cdce_xfer);
 			if (err)
 				return err;
 			c->cdce_buf = usbd_get_buffer(c->cdce_xfer);

Index: src/sys/dev/usb/if_cue.c
diff -u src/sys/dev/usb/if_cue.c:1.68.2.1 src/sys/dev/usb/if_cue.c:1.68.2.2
--- src/sys/dev/usb/if_cue.c:1.68.2.1	Wed Apr  5 19:54:19 2017
+++ src/sys/dev/usb/if_cue.c	Mon Feb 19 19:33:06 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_cue.c,v 1.68.2.1 2017/04/05 19:54:19 snj Exp $	*/
+/*	$NetBSD: if_cue.c,v 1.68.2.2 2018/02/19 19:33:06 snj Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
  *	Bill Paul <wp...@ee.columbia.edu>.  All rights reserved.
@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.68.2.1 2017/04/05 19:54:19 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.68.2.2 2018/02/19 19:33:06 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -693,7 +693,7 @@ cue_rx_list_init(struct cue_softc *sc)
 			return ENOBUFS;
 		if (c->cue_xfer == NULL) {
 			int error = usbd_create_xfer(sc->cue_ep[CUE_ENDPT_RX],
-			    CUE_BUFSZ, USBD_SHORT_XFER_OK, 0, &c->cue_xfer);
+			    CUE_BUFSZ, 0, 0, &c->cue_xfer);
 			if (error)
 				return error;
 			c->cue_buf = usbd_get_buffer(c->cue_xfer);

Index: src/sys/dev/usb/if_kue.c
diff -u src/sys/dev/usb/if_kue.c:1.81.2.1 src/sys/dev/usb/if_kue.c:1.81.2.2
--- src/sys/dev/usb/if_kue.c:1.81.2.1	Wed Apr  5 19:54:19 2017
+++ src/sys/dev/usb/if_kue.c	Mon Feb 19 19:33:06 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_kue.c,v 1.81.2.1 2017/04/05 19:54:19 snj Exp $	*/
+/*	$NetBSD: if_kue.c,v 1.81.2.2 2018/02/19 19:33:06 snj Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.81.2.1 2017/04/05 19:54:19 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.81.2.2 2018/02/19 19:33:06 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -594,7 +594,7 @@ kue_rx_list_init(struct kue_softc *sc)
 		c->kue_idx = i;
 		if (c->kue_xfer == NULL) {
 			int error = usbd_create_xfer(sc->kue_ep[KUE_ENDPT_RX],
-			    KUE_BUFSZ, USBD_SHORT_XFER_OK, 0, &c->kue_xfer);
+			    KUE_BUFSZ, 0, 0, &c->kue_xfer);
 			if (error)
 				return error;
 			c->kue_buf = usbd_get_buffer(c->kue_xfer);

Index: src/sys/dev/usb/if_otus.c
diff -u src/sys/dev/usb/if_otus.c:1.25.4.1 src/sys/dev/usb/if_otus.c:1.25.4.2
--- src/sys/dev/usb/if_otus.c:1.25.4.1	Wed Apr  5 19:54:19 2017
+++ src/sys/dev/usb/if_otus.c	Mon Feb 19 19:33:06 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_otus.c,v 1.25.4.1 2017/04/05 19:54:19 snj Exp $	*/
+/*	$NetBSD: if_otus.c,v 1.25.4.2 2018/02/19 19:33:06 snj Exp $	*/
 /*	$OpenBSD: if_otus.c,v 1.18 2010/08/27 17:08:00 jsg Exp $	*/
 
 /*-
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_otus.c,v 1.25.4.1 2017/04/05 19:54:19 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_otus.c,v 1.25.4.2 2018/02/19 19:33:06 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -1193,7 +1193,7 @@ otus_alloc_rx_data_list(struct otus_soft
 		data->sc = sc;	/* Backpointer for callbacks. */
 
 		error = usbd_create_xfer(sc->sc_data_rx_pipe, OTUS_RXBUFSZ,
-		    USBD_SHORT_XFER_OK, 0, &data->xfer);
+		   0, 0, &data->xfer);
 
 		if (error) {
 			aprint_error_dev(sc->sc_dev,

Index: src/sys/dev/usb/if_rum.c
diff -u src/sys/dev/usb/if_rum.c:1.48.4.1 src/sys/dev/usb/if_rum.c:1.48.4.2
--- src/sys/dev/usb/if_rum.c:1.48.4.1	Wed Apr  5 19:54:19 2017
+++ src/sys/dev/usb/if_rum.c	Mon Feb 19 19:33:06 2018
@@ -1,5 +1,5 @@
 /*	$OpenBSD: if_rum.c,v 1.40 2006/09/18 16:20:20 damien Exp $	*/
-/*	$NetBSD: if_rum.c,v 1.48.4.1 2017/04/05 19:54:19 snj Exp $	*/
+/*	$NetBSD: if_rum.c,v 1.48.4.2 2018/02/19 19:33:06 snj Exp $	*/
 
 /*-
  * Copyright (c) 2005-2007 Damien Bergamini <damien.bergam...@free.fr>
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.48.4.1 2017/04/05 19:54:19 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.48.4.2 2018/02/19 19:33:06 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -588,7 +588,7 @@ rum_alloc_rx_list(struct rum_softc *sc)
 		data->sc = sc;
 
 		error = usbd_create_xfer(sc->sc_rx_pipeh, MCLBYTES,
-		    USBD_SHORT_XFER_OK, 0, &data->xfer);
+		    0, 0, &data->xfer);
 		if (error) {
 			printf("%s: could not allocate rx xfer\n",
 			    device_xname(sc->sc_dev));

Index: src/sys/dev/usb/if_run.c
diff -u src/sys/dev/usb/if_run.c:1.10.4.2 src/sys/dev/usb/if_run.c:1.10.4.3
--- src/sys/dev/usb/if_run.c:1.10.4.2	Wed Apr  5 19:54:19 2017
+++ src/sys/dev/usb/if_run.c	Mon Feb 19 19:33:06 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_run.c,v 1.10.4.2 2017/04/05 19:54:19 snj Exp $	*/
+/*	$NetBSD: if_run.c,v 1.10.4.3 2018/02/19 19:33:06 snj Exp $	*/
 /*	$OpenBSD: if_run.c,v 1.90 2012/03/24 15:11:04 jsg Exp $	*/
 
 /*-
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.10.4.2 2017/04/05 19:54:19 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.10.4.3 2018/02/19 19:33:06 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -738,7 +738,7 @@ run_alloc_rx_ring(struct run_softc *sc)
 		data->sc = sc;	/* backpointer for callbacks */
 
 		error = usbd_create_xfer(sc->rxq.pipeh, RUN_MAX_RXSZ,
-		    USBD_SHORT_XFER_OK, 0, &data->xfer);
+		    0, 0, &data->xfer);
 		if (error)
 			goto fail;
 

Index: src/sys/dev/usb/if_smsc.c
diff -u src/sys/dev/usb/if_smsc.c:1.19.2.3 src/sys/dev/usb/if_smsc.c:1.19.2.4
--- src/sys/dev/usb/if_smsc.c:1.19.2.3	Wed Apr  5 19:54:19 2017
+++ src/sys/dev/usb/if_smsc.c	Mon Feb 19 19:33:06 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_smsc.c,v 1.19.2.3 2017/04/05 19:54:19 snj Exp $	*/
+/*	$NetBSD: if_smsc.c,v 1.19.2.4 2018/02/19 19:33:06 snj Exp $	*/
 
 /*	$OpenBSD: if_smsc.c,v 1.4 2012/09/27 12:38:11 jsg Exp $	*/
 /* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */
@@ -1574,7 +1574,7 @@ smsc_rx_list_init(struct smsc_softc *sc)
 		c->sc_mbuf = NULL;
 		if (c->sc_xfer == NULL) {
 			int error = usbd_create_xfer(sc->sc_ep[SMSC_ENDPT_RX],
-			    sc->sc_bufsz, USBD_SHORT_XFER_OK, 0, &c->sc_xfer);
+			    sc->sc_bufsz, 0, 0, &c->sc_xfer);
 			if (error)
 				return error;
 			c->sc_buf = usbd_get_buffer(c->sc_xfer);

Index: src/sys/dev/usb/if_udav.c
diff -u src/sys/dev/usb/if_udav.c:1.43.2.1 src/sys/dev/usb/if_udav.c:1.43.2.2
--- src/sys/dev/usb/if_udav.c:1.43.2.1	Wed Apr  5 19:54:19 2017
+++ src/sys/dev/usb/if_udav.c	Mon Feb 19 19:33:06 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_udav.c,v 1.43.2.1 2017/04/05 19:54:19 snj Exp $	*/
+/*	$NetBSD: if_udav.c,v 1.43.2.2 2018/02/19 19:33:06 snj Exp $	*/
 /*	$nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $	*/
 
 /*
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.43.2.1 2017/04/05 19:54:19 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.43.2.2 2018/02/19 19:33:06 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -959,7 +959,7 @@ udav_rx_list_init(struct udav_softc *sc)
 			return ENOBUFS;
 		if (c->udav_xfer == NULL) {
 			int error = usbd_create_xfer(sc->sc_pipe_rx,
-			    UDAV_BUFSZ, USBD_SHORT_XFER_OK, 0, &c->udav_xfer);
+			    UDAV_BUFSZ, 0, 0, &c->udav_xfer);
 			if (error)
 				return error;
 			c->udav_buf = usbd_get_buffer(c->udav_xfer);

Index: src/sys/dev/usb/if_upgt.c
diff -u src/sys/dev/usb/if_upgt.c:1.12.2.1 src/sys/dev/usb/if_upgt.c:1.12.2.2
--- src/sys/dev/usb/if_upgt.c:1.12.2.1	Wed Apr  5 19:54:19 2017
+++ src/sys/dev/usb/if_upgt.c	Mon Feb 19 19:33:06 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_upgt.c,v 1.12.2.1 2017/04/05 19:54:19 snj Exp $	*/
+/*	$NetBSD: if_upgt.c,v 1.12.2.2 2018/02/19 19:33:06 snj Exp $	*/
 /*	$OpenBSD: if_upgt.c,v 1.49 2010/04/20 22:05:43 tedu Exp $ */
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_upgt.c,v 1.12.2.1 2017/04/05 19:54:19 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_upgt.c,v 1.12.2.2 2018/02/19 19:33:06 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -2266,8 +2266,8 @@ upgt_alloc_tx(struct upgt_softc *sc)
 
 		data_tx->sc = sc;
 
-		int err = usbd_create_xfer(sc->sc_tx_pipeh, MCLBYTES, 0, 0,
-		    &data_tx->xfer);
+		int err = usbd_create_xfer(sc->sc_tx_pipeh, MCLBYTES,
+		    USBD_FORCE_SHORT_XFER, 0, &data_tx->xfer);
 		if (err) {
 			aprint_error_dev(sc->sc_dev,
 			    "could not allocate TX xfer\n");
@@ -2288,7 +2288,7 @@ upgt_alloc_rx(struct upgt_softc *sc)
 	data_rx->sc = sc;
 
 	int err = usbd_create_xfer(sc->sc_rx_pipeh, MCLBYTES,
-	    USBD_SHORT_XFER_OK, 0, &data_rx->xfer);
+	    0, 0, &data_rx->xfer);
 	if (err) {
 		aprint_error_dev(sc->sc_dev, "could not allocate RX xfer\n");
 		return err;

Index: src/sys/dev/usb/if_upl.c
diff -u src/sys/dev/usb/if_upl.c:1.47.2.1 src/sys/dev/usb/if_upl.c:1.47.2.2
--- src/sys/dev/usb/if_upl.c:1.47.2.1	Wed Apr  5 19:54:19 2017
+++ src/sys/dev/usb/if_upl.c	Mon Feb 19 19:33:06 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_upl.c,v 1.47.2.1 2017/04/05 19:54:19 snj Exp $	*/
+/*	$NetBSD: if_upl.c,v 1.47.2.2 2018/02/19 19:33:06 snj Exp $	*/
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.47.2.1 2017/04/05 19:54:19 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.47.2.2 2018/02/19 19:33:06 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -435,7 +435,7 @@ upl_rx_list_init(struct upl_softc *sc)
 			return ENOBUFS;
 		if (c->upl_xfer == NULL) {
 			int error = usbd_create_xfer(sc->sc_ep[UPL_ENDPT_RX],
-			    UPL_BUFSZ, USBD_SHORT_XFER_OK, 0, &c->upl_xfer);
+			    UPL_BUFSZ, 0, 0, &c->upl_xfer);
 			if (error)
 				return error;
 			c->upl_buf = usbd_get_buffer(c->upl_xfer);

Index: src/sys/dev/usb/if_ural.c
diff -u src/sys/dev/usb/if_ural.c:1.44.12.2 src/sys/dev/usb/if_ural.c:1.44.12.3
--- src/sys/dev/usb/if_ural.c:1.44.12.2	Wed Aug  9 06:34:53 2017
+++ src/sys/dev/usb/if_ural.c	Mon Feb 19 19:33:06 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ural.c,v 1.44.12.2 2017/08/09 06:34:53 snj Exp $ */
+/*	$NetBSD: if_ural.c,v 1.44.12.3 2018/02/19 19:33:06 snj Exp $ */
 /*	$FreeBSD: /repoman/r/ncvs/src/sys/dev/usb/if_ural.c,v 1.40 2006/06/02 23:14:40 sam Exp $	*/
 
 /*-
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.44.12.2 2017/08/09 06:34:53 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.44.12.3 2018/02/19 19:33:06 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -624,7 +624,7 @@ ural_alloc_rx_list(struct ural_softc *sc
 		data->sc = sc;
 
 		error = usbd_create_xfer(sc->sc_rx_pipeh, MCLBYTES,
-		    USBD_SHORT_XFER_OK, 0, &data->xfer);
+		    0, 0, &data->xfer);
 		if (error) {
 			printf("%s: could not allocate rx xfer\n",
 			    device_xname(sc->sc_dev));

Index: src/sys/dev/usb/if_url.c
diff -u src/sys/dev/usb/if_url.c:1.48.2.1 src/sys/dev/usb/if_url.c:1.48.2.2
--- src/sys/dev/usb/if_url.c:1.48.2.1	Wed Apr  5 19:54:19 2017
+++ src/sys/dev/usb/if_url.c	Mon Feb 19 19:33:06 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_url.c,v 1.48.2.1 2017/04/05 19:54:19 snj Exp $	*/
+/*	$NetBSD: if_url.c,v 1.48.2.2 2018/02/19 19:33:06 snj Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.48.2.1 2017/04/05 19:54:19 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.48.2.2 2018/02/19 19:33:06 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -808,7 +808,7 @@ url_rx_list_init(struct url_softc *sc)
 			return ENOBUFS;
 		if (c->url_xfer == NULL) {
 			int error = usbd_create_xfer(sc->sc_pipe_rx, URL_BUFSZ,
-			    USBD_SHORT_XFER_OK, 0, &c->url_xfer);
+			    0, 0, &c->url_xfer);
 			if (error)
 				return error;
 			c->url_buf = usbd_get_buffer(c->url_xfer);

Index: src/sys/dev/usb/if_urndis.c
diff -u src/sys/dev/usb/if_urndis.c:1.9.2.1 src/sys/dev/usb/if_urndis.c:1.9.2.2
--- src/sys/dev/usb/if_urndis.c:1.9.2.1	Wed Apr  5 19:54:19 2017
+++ src/sys/dev/usb/if_urndis.c	Mon Feb 19 19:33:06 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_urndis.c,v 1.9.2.1 2017/04/05 19:54:19 snj Exp $ */
+/*	$NetBSD: if_urndis.c,v 1.9.2.2 2018/02/19 19:33:06 snj Exp $ */
 /*	$OpenBSD: if_urndis.c,v 1.31 2011/07/03 15:47:17 matthew Exp $ */
 
 /*
@@ -21,7 +21,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urndis.c,v 1.9.2.1 2017/04/05 19:54:19 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urndis.c,v 1.9.2.2 2018/02/19 19:33:06 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -936,7 +936,7 @@ urndis_rx_list_init(struct urndis_softc 
 
 		if (c->sc_xfer == NULL) {
 			int err = usbd_create_xfer(sc->sc_bulkin_pipe,
-			    RNDIS_BUFSZ, USBD_SHORT_XFER_OK, 0, &c->sc_xfer);
+			    RNDIS_BUFSZ, 0, 0, &c->sc_xfer);
 			if (err)
 				return err;
 			c->sc_buf = usbd_get_buffer(c->sc_xfer);

Index: src/sys/dev/usb/if_urtw.c
diff -u src/sys/dev/usb/if_urtw.c:1.6.4.1 src/sys/dev/usb/if_urtw.c:1.6.4.2
--- src/sys/dev/usb/if_urtw.c:1.6.4.1	Wed Apr  5 19:54:19 2017
+++ src/sys/dev/usb/if_urtw.c	Mon Feb 19 19:33:06 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_urtw.c,v 1.6.4.1 2017/04/05 19:54:19 snj Exp $	*/
+/*	$NetBSD: if_urtw.c,v 1.6.4.2 2018/02/19 19:33:06 snj Exp $	*/
 /*	$OpenBSD: if_urtw.c,v 1.39 2011/07/03 15:47:17 matthew Exp $	*/
 
 /*-
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urtw.c,v 1.6.4.1 2017/04/05 19:54:19 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtw.c,v 1.6.4.2 2018/02/19 19:33:06 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -901,7 +901,7 @@ urtw_alloc_rx_data_list(struct urtw_soft
 		data->sc = sc;
 
 		error = usbd_create_xfer(sc->sc_rxpipe, MCLBYTES,
-		    USBD_SHORT_XFER_OK, 0, &data->xfer);
+		    0, 0, &data->xfer);
 		if (error) {
 
 			printf("%s: could not allocate rx xfer\n",

Index: src/sys/dev/usb/if_urtwn.c
diff -u src/sys/dev/usb/if_urtwn.c:1.34.2.2 src/sys/dev/usb/if_urtwn.c:1.34.2.3
--- src/sys/dev/usb/if_urtwn.c:1.34.2.2	Wed Jan  3 20:00:23 2018
+++ src/sys/dev/usb/if_urtwn.c	Mon Feb 19 19:33:06 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_urtwn.c,v 1.34.2.2 2018/01/03 20:00:23 snj Exp $	*/
+/*	$NetBSD: if_urtwn.c,v 1.34.2.3 2018/02/19 19:33:06 snj Exp $	*/
 /*	$OpenBSD: if_urtwn.c,v 1.42 2015/02/10 23:25:46 mpi Exp $	*/
 
 /*-
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.34.2.2 2018/01/03 20:00:23 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.34.2.3 2018/02/19 19:33:06 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -709,7 +709,7 @@ urtwn_alloc_rx_list(struct urtwn_softc *
 			data->sc = sc;	/* Backpointer for callbacks. */
 
 			error = usbd_create_xfer(sc->rx_pipe[j], URTWN_RXBUFSZ,
-			    USBD_SHORT_XFER_OK, 0, &data->xfer);
+			    0, 0, &data->xfer);
 			if (error) {
 				aprint_error_dev(sc->sc_dev,
 				    "could not allocate xfer\n");

Index: src/sys/dev/usb/if_zyd.c
diff -u src/sys/dev/usb/if_zyd.c:1.36.12.1 src/sys/dev/usb/if_zyd.c:1.36.12.2
--- src/sys/dev/usb/if_zyd.c:1.36.12.1	Wed Apr  5 19:54:19 2017
+++ src/sys/dev/usb/if_zyd.c	Mon Feb 19 19:33:06 2018
@@ -1,5 +1,5 @@
 /*	$OpenBSD: if_zyd.c,v 1.52 2007/02/11 00:08:04 jsg Exp $	*/
-/*	$NetBSD: if_zyd.c,v 1.36.12.1 2017/04/05 19:54:19 snj Exp $	*/
+/*	$NetBSD: if_zyd.c,v 1.36.12.2 2018/02/19 19:33:06 snj Exp $	*/
 
 /*-
  * Copyright (c) 2006 by Damien Bergamini <damien.bergam...@free.fr>
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.36.12.1 2017/04/05 19:54:19 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.36.12.2 2018/02/19 19:33:06 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -632,7 +632,7 @@ zyd_alloc_rx_list(struct zyd_softc *sc)
 		data->sc = sc;	/* backpointer for callbacks */
 
 		error = usbd_create_xfer(sc->zyd_ep[ZYD_ENDPT_BIN],
-		    ZYX_MAX_RXBUFSZ, USBD_SHORT_XFER_OK, 0, &data->xfer);
+		    ZYX_MAX_RXBUFSZ, 0, 0, &data->xfer);
 		if (error) {
 			printf("%s: could not allocate rx xfer\n",
 			    device_xname(sc->sc_dev));

Index: src/sys/dev/usb/irmce.c
diff -u src/sys/dev/usb/irmce.c:1.1.30.1 src/sys/dev/usb/irmce.c:1.1.30.2
--- src/sys/dev/usb/irmce.c:1.1.30.1	Wed Apr  5 19:54:19 2017
+++ src/sys/dev/usb/irmce.c	Mon Feb 19 19:33:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: irmce.c,v 1.1.30.1 2017/04/05 19:54:19 snj Exp $ */
+/* $NetBSD: irmce.c,v 1.1.30.2 2018/02/19 19:33:06 snj Exp $ */
 
 /*-
  * Copyright (c) 2011 Jared D. McNeill <jmcne...@invisible.ca>
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: irmce.c,v 1.1.30.1 2017/04/05 19:54:19 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irmce.c,v 1.1.30.2 2018/02/19 19:33:06 snj Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -225,7 +225,7 @@ irmce_attach(device_t parent, device_t s
 
 	int error;
 	error = usbd_create_xfer(sc->sc_bulkin_pipe, sc->sc_bulkin_maxpktsize,
-	    USBD_SHORT_XFER_OK, 0, &sc->sc_bulkin_xfer);
+	    0, 0, &sc->sc_bulkin_xfer);
 	if (error) {
 		goto fail;
 	}

Index: src/sys/dev/usb/pseye.c
diff -u src/sys/dev/usb/pseye.c:1.21.32.1 src/sys/dev/usb/pseye.c:1.21.32.2
--- src/sys/dev/usb/pseye.c:1.21.32.1	Wed Apr  5 19:54:19 2017
+++ src/sys/dev/usb/pseye.c	Mon Feb 19 19:33:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pseye.c,v 1.21.32.1 2017/04/05 19:54:19 snj Exp $ */
+/* $NetBSD: pseye.c,v 1.21.32.2 2018/02/19 19:33:06 snj Exp $ */
 
 /*-
  * Copyright (c) 2008 Jared D. McNeill <jmcne...@invisible.ca>
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pseye.c,v 1.21.32.1 2017/04/05 19:54:19 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pseye.c,v 1.21.32.2 2018/02/19 19:33:06 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -245,7 +245,7 @@ pseye_attach(device_t parent, device_t s
 	}
 
 	error = usbd_create_xfer(sc->sc_bulkin_pipe, sc->sc_bulkin_bufferlen,
-	    USBD_SHORT_XFER_OK, 0, &sc->sc_bulkin_xfer);
+	    0, 0, &sc->sc_bulkin_xfer);
 	if (error) {
 		aprint_error_dev(self, "couldn't create transfer\n");
 		pseye_close_pipes(sc);

Index: src/sys/dev/usb/ubt.c
diff -u src/sys/dev/usb/ubt.c:1.51.2.1 src/sys/dev/usb/ubt.c:1.51.2.2
--- src/sys/dev/usb/ubt.c:1.51.2.1	Wed Apr  5 19:54:19 2017
+++ src/sys/dev/usb/ubt.c	Mon Feb 19 19:33:06 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ubt.c,v 1.51.2.1 2017/04/05 19:54:19 snj Exp $	*/
+/*	$NetBSD: ubt.c,v 1.51.2.2 2018/02/19 19:33:06 snj Exp $	*/
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.51.2.1 2017/04/05 19:54:19 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.51.2.2 2018/02/19 19:33:06 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -1012,8 +1012,8 @@ ubt_enable(device_t self)
 
 	/* Commands */
 	struct usbd_pipe *pipe0 = usbd_get_pipe0(sc->sc_udev);
-	error = usbd_create_xfer(pipe0, UBT_BUFSIZ_CMD, 0, 0,
-	    &sc->sc_cmd_xfer);
+	error = usbd_create_xfer(pipe0, UBT_BUFSIZ_CMD, USBD_FORCE_SHORT_XFER,
+	    0, &sc->sc_cmd_xfer);
 	if (error)
 		goto bad;
 	sc->sc_cmd_buf = usbd_get_buffer(sc->sc_cmd_xfer);
@@ -1027,7 +1027,7 @@ ubt_enable(device_t self)
 		goto bad;
 	}
 	error = usbd_create_xfer(sc->sc_aclrd_pipe, UBT_BUFSIZ_ACL,
-	    USBD_SHORT_XFER_OK, 0, &sc->sc_aclrd_xfer);
+	    0, 0, &sc->sc_aclrd_xfer);
 	if (error)
 		goto bad;
 	sc->sc_aclrd_buf = usbd_get_buffer(sc->sc_aclrd_xfer);
@@ -1060,7 +1060,7 @@ ubt_enable(device_t self)
 		for (i = 0 ; i < UBT_NXFERS ; i++) {
 		        error = usbd_create_xfer(sc->sc_scord_pipe,
 			    sc->sc_scord_size * UBT_NFRAMES,
-			    USBD_SHORT_XFER_OK, UBT_NFRAMES,
+			    0, UBT_NFRAMES,
 			    &sc->sc_scord[i].xfer);
 			if (error)
 				goto bad;

Index: src/sys/dev/usb/ucom.c
diff -u src/sys/dev/usb/ucom.c:1.107.2.2 src/sys/dev/usb/ucom.c:1.107.2.3
--- src/sys/dev/usb/ucom.c:1.107.2.2	Wed Apr  5 19:54:19 2017
+++ src/sys/dev/usb/ucom.c	Mon Feb 19 19:33:06 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ucom.c,v 1.107.2.2 2017/04/05 19:54:19 snj Exp $	*/
+/*	$NetBSD: ucom.c,v 1.107.2.3 2018/02/19 19:33:06 snj Exp $	*/
 
 /*
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.107.2.2 2017/04/05 19:54:19 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.107.2.3 2018/02/19 19:33:06 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -334,7 +334,7 @@ ucom_attach(device_t parent, device_t se
 		for (ub = &sc->sc_ibuff[0]; ub != &sc->sc_ibuff[UCOM_IN_BUFFS];
 		    ub++) {
 			error = usbd_create_xfer(sc->sc_bulkin_pipe,
-			    sc->sc_ibufsizepad, USBD_SHORT_XFER_OK, 0,
+			    sc->sc_ibufsizepad, 0, 0,
 			    &ub->ub_xfer);
 			if (error)
 				goto fail_1;

Index: src/sys/dev/usb/udsir.c
diff -u src/sys/dev/usb/udsir.c:1.1.12.1 src/sys/dev/usb/udsir.c:1.1.12.2
--- src/sys/dev/usb/udsir.c:1.1.12.1	Wed Apr  5 19:54:20 2017
+++ src/sys/dev/usb/udsir.c	Mon Feb 19 19:33:06 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: udsir.c,v 1.1.12.1 2017/04/05 19:54:20 snj Exp $	*/
+/*	$NetBSD: udsir.c,v 1.1.12.2 2018/02/19 19:33:06 snj Exp $	*/
 
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udsir.c,v 1.1.12.1 2017/04/05 19:54:20 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udsir.c,v 1.1.12.2 2018/02/19 19:33:06 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -344,7 +344,7 @@ udsir_open(void *h, int flag, int mode, 
 		goto bad2;
 	}
 	error = usbd_create_xfer(sc->sc_rd_pipe, sc->sc_rd_maxpsz,
-	    USBD_SHORT_XFER_OK, 0, &sc->sc_rd_xfer);
+	    0, 0, &sc->sc_rd_xfer);
 	if (error)
 		 goto bad3;
 

Index: src/sys/dev/usb/ugen.c
diff -u src/sys/dev/usb/ugen.c:1.124.2.3 src/sys/dev/usb/ugen.c:1.124.2.4
--- src/sys/dev/usb/ugen.c:1.124.2.3	Wed Apr  5 19:54:20 2017
+++ src/sys/dev/usb/ugen.c	Mon Feb 19 19:33:06 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ugen.c,v 1.124.2.3 2017/04/05 19:54:20 snj Exp $	*/
+/*	$NetBSD: ugen.c,v 1.124.2.4 2018/02/19 19:33:06 snj Exp $	*/
 
 /*
  * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.124.2.3 2017/04/05 19:54:20 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.124.2.4 2018/02/19 19:33:06 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -720,8 +720,7 @@ ugen_do_read(struct ugen_softc *sc, int 
 			break;
 		}
 		error = usbd_create_xfer(sce->pipeh, UGEN_BBSIZE,
-		    sce->state & UGEN_SHORT_OK ? USBD_SHORT_XFER_OK : 0,
-		    0, &xfer);
+		    0, 0, &xfer);
 		if (error)
 			return error;
 		while ((n = min(UGEN_BBSIZE, uio->uio_resid)) != 0) {
@@ -933,8 +932,7 @@ ugen_do_write(struct ugen_softc *sc, int
 			break;
 		}
 		error = usbd_create_xfer(sce->pipeh, UGEN_BBSIZE,
-		    sce->state & UGEN_SHORT_OK ? USBD_SHORT_XFER_OK : 0,
-		    0, &xfer);
+		    0, 0, &xfer);
 		if (error)
 			return error;
 		while ((n = min(UGEN_BBSIZE, uio->uio_resid)) != 0) {

Index: src/sys/dev/usb/uhso.c
diff -u src/sys/dev/usb/uhso.c:1.16.2.1 src/sys/dev/usb/uhso.c:1.16.2.2
--- src/sys/dev/usb/uhso.c:1.16.2.1	Wed Apr  5 19:54:20 2017
+++ src/sys/dev/usb/uhso.c	Mon Feb 19 19:33:06 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: uhso.c,v 1.16.2.1 2017/04/05 19:54:20 snj Exp $	*/
+/*	$NetBSD: uhso.c,v 1.16.2.2 2018/02/19 19:33:06 snj Exp $	*/
 
 /*-
  * Copyright (c) 2009 Iain Hibbert
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.16.2.1 2017/04/05 19:54:20 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.16.2.2 2018/02/19 19:33:06 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1163,7 +1163,7 @@ uhso_bulk_init(struct uhso_port *hp)
 	}
 
 	int error = usbd_create_xfer(hp->hp_rpipe, hp->hp_rsize,
-	    USBD_SHORT_XFER_OK, 0, &hp->hp_rxfer);
+	    0, 0, &hp->hp_rxfer);
 	if (error)
 		return error;
 

Index: src/sys/dev/usb/uirda.c
diff -u src/sys/dev/usb/uirda.c:1.38.4.1 src/sys/dev/usb/uirda.c:1.38.4.2
--- src/sys/dev/usb/uirda.c:1.38.4.1	Wed Apr  5 19:54:20 2017
+++ src/sys/dev/usb/uirda.c	Mon Feb 19 19:33:06 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: uirda.c,v 1.38.4.1 2017/04/05 19:54:20 snj Exp $	*/
+/*	$NetBSD: uirda.c,v 1.38.4.2 2018/02/19 19:33:06 snj Exp $	*/
 
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.38.4.1 2017/04/05 19:54:20 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.38.4.2 2018/02/19 19:33:06 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -395,7 +395,7 @@ uirda_open(void *h, int flag, int mode,
 		goto bad2;
 	}
 	error = usbd_create_xfer(sc->sc_rd_pipe,
-	    IRDA_MAX_FRAME_SIZE + sc->sc_hdszi, USBD_SHORT_XFER_OK, 0,
+	    IRDA_MAX_FRAME_SIZE + sc->sc_hdszi, 0, 0,
 	    &sc->sc_rd_xfer);
 	if (error)
 		goto bad3;
Index: src/sys/dev/usb/usscanner.c
diff -u src/sys/dev/usb/usscanner.c:1.38.4.1 src/sys/dev/usb/usscanner.c:1.38.4.2
--- src/sys/dev/usb/usscanner.c:1.38.4.1	Wed Apr  5 19:54:21 2017
+++ src/sys/dev/usb/usscanner.c	Mon Feb 19 19:33:06 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: usscanner.c,v 1.38.4.1 2017/04/05 19:54:21 snj Exp $	*/
+/*	$NetBSD: usscanner.c,v 1.38.4.2 2018/02/19 19:33:06 snj Exp $	*/
 
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usscanner.c,v 1.38.4.1 2017/04/05 19:54:21 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usscanner.c,v 1.38.4.2 2018/02/19 19:33:06 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -281,8 +281,7 @@ usscanner_attach(device_t parent, device
 
 	sc->sc_cmd_buffer = usbd_get_buffer(sc->sc_cmd_xfer);
 
-	error = usbd_create_xfer(sc->sc_intr_pipe, 1, USBD_SHORT_XFER_OK,
-	    0, &sc->sc_intr_xfer);
+	error = usbd_create_xfer(sc->sc_intr_pipe, 1, 0, 0, &sc->sc_intr_xfer);
 	if (error) {
 		aprint_error_dev(self, "alloc intr xfer failed, error=%d\n",
 		    error);
@@ -291,7 +290,7 @@ usscanner_attach(device_t parent, device
 	}
 
 	error = usbd_create_xfer(sc->sc_in_pipe, USSCANNER_MAX_TRANSFER_SIZE,
-	    USBD_SHORT_XFER_OK, 0, &sc->sc_datain_xfer);
+	    0, 0, &sc->sc_datain_xfer);
 	if (error) {
 		aprint_error_dev(self, "alloc data xfer failed, error=%d\n",
 		    error);
@@ -301,7 +300,7 @@ usscanner_attach(device_t parent, device
 	sc->sc_datain_buffer = usbd_get_buffer(sc->sc_datain_xfer);
 
 	error = usbd_create_xfer(sc->sc_out_pipe, USSCANNER_MAX_TRANSFER_SIZE,
-	    USBD_SHORT_XFER_OK, 0, &sc->sc_dataout_xfer);
+	    0, 0, &sc->sc_dataout_xfer);
 	if (error) {
 		aprint_error_dev(self, "alloc data xfer failed, err=%d\n", err);
 		usscanner_cleanup(sc);

Index: src/sys/dev/usb/ulpt.c
diff -u src/sys/dev/usb/ulpt.c:1.95.2.1 src/sys/dev/usb/ulpt.c:1.95.2.2
--- src/sys/dev/usb/ulpt.c:1.95.2.1	Wed Apr  5 19:54:20 2017
+++ src/sys/dev/usb/ulpt.c	Mon Feb 19 19:33:06 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ulpt.c,v 1.95.2.1 2017/04/05 19:54:20 snj Exp $	*/
+/*	$NetBSD: ulpt.c,v 1.95.2.2 2018/02/19 19:33:06 snj Exp $	*/
 
 /*
  * Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.95.2.1 2017/04/05 19:54:20 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.95.2.2 2018/02/19 19:33:06 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -497,7 +497,7 @@ ulptopen(dev_t dev, int flag, int mode, 
 			goto err2;
 		}
 		error = usbd_create_xfer(sc->sc_in_pipe, ULPT_BSIZE,
-		    USBD_SHORT_XFER_OK, 0, &sc->sc_in_xfer);
+		    0, 0, &sc->sc_in_xfer);
 		if (error)
 			goto err3;
 		sc->sc_in_buf = usbd_get_buffer(sc->sc_in_xfer);

Index: src/sys/dev/usb/umass.c
diff -u src/sys/dev/usb/umass.c:1.148.4.1 src/sys/dev/usb/umass.c:1.148.4.2
--- src/sys/dev/usb/umass.c:1.148.4.1	Wed Apr  5 19:54:20 2017
+++ src/sys/dev/usb/umass.c	Mon Feb 19 19:33:06 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: umass.c,v 1.148.4.1 2017/04/05 19:54:20 snj Exp $	*/
+/*	$NetBSD: umass.c,v 1.148.4.2 2018/02/19 19:33:06 snj Exp $	*/
 
 /*
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -124,7 +124,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.148.4.1 2017/04/05 19:54:20 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.148.4.2 2018/02/19 19:33:06 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -585,27 +585,27 @@ umass_attach(device_t parent, device_t s
 	switch (sc->sc_wire) {
 	case UMASS_WPROTO_BBB:
 		err = usbd_create_xfer(sc->sc_pipe[UMASS_BULKIN],
-		    UMASS_MAX_TRANSFER_SIZE, USBD_SHORT_XFER_OK, 0,
+		    UMASS_MAX_TRANSFER_SIZE, 0, 0,
 		    &sc->transfer_xfer[XFER_BBB_DATAIN]);
 		if (err)
 			goto fail_create;
 		err = usbd_create_xfer(sc->sc_pipe[UMASS_BULKOUT],
-		    UMASS_MAX_TRANSFER_SIZE, USBD_SHORT_XFER_OK, 0,
+		    UMASS_MAX_TRANSFER_SIZE, 0, 0,
 		    &sc->transfer_xfer[XFER_BBB_DATAOUT]);
 		if (err)
 			goto fail_create;
 		err = usbd_create_xfer(sc->sc_pipe[UMASS_BULKOUT],
-		    UMASS_BBB_CBW_SIZE, USBD_SHORT_XFER_OK, 0,
+		    UMASS_BBB_CBW_SIZE, 0, 0,
 		    &sc->transfer_xfer[XFER_BBB_CBW]);
 		if (err)
 			goto fail_create;
 		err = usbd_create_xfer(sc->sc_pipe[UMASS_BULKIN],
-		    UMASS_BBB_CSW_SIZE, USBD_SHORT_XFER_OK, 0,
+		    UMASS_BBB_CSW_SIZE, 0, 0,
 		    &sc->transfer_xfer[XFER_BBB_CSW1]);
 		if (err)
 			goto fail_create;
 		err = usbd_create_xfer(sc->sc_pipe[UMASS_BULKIN],
-		    UMASS_BBB_CSW_SIZE, USBD_SHORT_XFER_OK, 0,
+		    UMASS_BBB_CSW_SIZE, 0, 0,
 		    &sc->transfer_xfer[XFER_BBB_CSW2]);
 		if (err)
 			goto fail_create;
@@ -637,7 +637,7 @@ umass_attach(device_t parent, device_t s
 		if (err)
 			goto fail_create;
 		err = usbd_create_xfer(sc->sc_pipe[UMASS_BULKIN],
-		    UMASS_MAX_TRANSFER_SIZE, USBD_SHORT_XFER_OK, 0,
+		    UMASS_MAX_TRANSFER_SIZE, 0, 0,
 		    &sc->transfer_xfer[XFER_CBI_DATAIN]);
 		if (err)
 			goto fail_create;

Index: src/sys/dev/usb/umidi.c
diff -u src/sys/dev/usb/umidi.c:1.65.12.2 src/sys/dev/usb/umidi.c:1.65.12.3
--- src/sys/dev/usb/umidi.c:1.65.12.2	Wed Apr  5 19:54:20 2017
+++ src/sys/dev/usb/umidi.c	Mon Feb 19 19:33:06 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: umidi.c,v 1.65.12.2 2017/04/05 19:54:20 snj Exp $	*/
+/*	$NetBSD: umidi.c,v 1.65.12.3 2018/02/19 19:33:06 snj Exp $	*/
 
 /*
  * Copyright (c) 2001, 2012, 2014 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.65.12.2 2017/04/05 19:54:20 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.65.12.3 2018/02/19 19:33:06 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -694,7 +694,7 @@ alloc_pipe(struct umidi_endpoint *ep)
 	if (err)
 		goto quit;
 	int error = usbd_create_xfer(ep->pipe, ep->buffer_size,
-	    USBD_SHORT_XFER_OK, 0, &ep->xfer);
+	    0, 0, &ep->xfer);
 	if (error) {
 		usbd_close_pipe(ep->pipe);
 		return USBD_NOMEM;

Index: src/sys/dev/usb/uscanner.c
diff -u src/sys/dev/usb/uscanner.c:1.75.2.1 src/sys/dev/usb/uscanner.c:1.75.2.2
--- src/sys/dev/usb/uscanner.c:1.75.2.1	Wed Apr  5 19:54:21 2017
+++ src/sys/dev/usb/uscanner.c	Mon Feb 19 19:33:06 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: uscanner.c,v 1.75.2.1 2017/04/05 19:54:21 snj Exp $	*/
+/*	$NetBSD: uscanner.c,v 1.75.2.2 2018/02/19 19:33:06 snj Exp $	*/
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.75.2.1 2017/04/05 19:54:21 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.75.2.2 2018/02/19 19:33:06 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -414,7 +414,7 @@ uscanneropen(dev_t dev, int flag, int mo
 	}
 
 	int error = usbd_create_xfer(sc->sc_bulkin_pipe, USCANNER_BUFFERSIZE,
-	    USBD_SHORT_XFER_OK, 0, &sc->sc_bulkin_xfer);
+	    0, 0, &sc->sc_bulkin_xfer);
 	if (error) {
 		uscanner_do_close(sc);
 		return error;

Index: src/sys/dev/usb/ustir.c
diff -u src/sys/dev/usb/ustir.c:1.33.8.1 src/sys/dev/usb/ustir.c:1.33.8.2
--- src/sys/dev/usb/ustir.c:1.33.8.1	Wed Apr  5 19:54:21 2017
+++ src/sys/dev/usb/ustir.c	Mon Feb 19 19:33:06 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ustir.c,v 1.33.8.1 2017/04/05 19:54:21 snj Exp $	*/
+/*	$NetBSD: ustir.c,v 1.33.8.2 2018/02/19 19:33:06 snj Exp $	*/
 
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.33.8.1 2017/04/05 19:54:21 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.33.8.2 2018/02/19 19:33:06 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -711,7 +711,7 @@ ustir_open(void *h, int flag, int mode,
 		goto bad2;
 	}
 	error = usbd_create_xfer(sc->sc_rd_pipe, IRDA_MAX_FRAME_SIZE,
-	    USBD_SHORT_XFER_OK, 0, &sc->sc_rd_xfer);
+	    0, 0, &sc->sc_rd_xfer);
 	if (error)
 		goto bad3;
 	sc->sc_rd_buf = usbd_get_buffer(sc->sc_rd_xfer);

Index: src/sys/dev/usb/utoppy.c
diff -u src/sys/dev/usb/utoppy.c:1.24.2.1 src/sys/dev/usb/utoppy.c:1.24.2.2
--- src/sys/dev/usb/utoppy.c:1.24.2.1	Wed Apr  5 19:54:21 2017
+++ src/sys/dev/usb/utoppy.c	Mon Feb 19 19:33:06 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: utoppy.c,v 1.24.2.1 2017/04/05 19:54:21 snj Exp $	*/
+/*	$NetBSD: utoppy.c,v 1.24.2.2 2018/02/19 19:33:06 snj Exp $	*/
 
 /*-
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: utoppy.c,v 1.24.2.1 2017/04/05 19:54:21 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: utoppy.c,v 1.24.2.2 2018/02/19 19:33:06 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -317,7 +317,7 @@ utoppy_attach(device_t parent, device_t 
 	}
 
 	error = usbd_create_xfer(sc->sc_in_pipe, UTOPPY_FRAG_SIZE,
-	    USBD_SHORT_XFER_OK, 0, &sc->sc_in_xfer);
+	    0, 0, &sc->sc_in_xfer);
 	if (error) {
 		aprint_error_dev(self, "could not allocate bulk in xfer\n");
 		goto fail1;

Index: src/sys/dev/usb/uvideo.c
diff -u src/sys/dev/usb/uvideo.c:1.40.4.1 src/sys/dev/usb/uvideo.c:1.40.4.2
--- src/sys/dev/usb/uvideo.c:1.40.4.1	Wed Apr  5 19:54:21 2017
+++ src/sys/dev/usb/uvideo.c	Mon Feb 19 19:33:06 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvideo.c,v 1.40.4.1 2017/04/05 19:54:21 snj Exp $	*/
+/*	$NetBSD: uvideo.c,v 1.40.4.2 2018/02/19 19:33:06 snj Exp $	*/
 
 /*
  * Copyright (c) 2008 Patrick Mahoney
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.40.4.1 2017/04/05 19:54:21 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.40.4.2 2018/02/19 19:33:06 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -1485,7 +1485,7 @@ uvideo_stream_start_xfer(struct uvideo_s
 		DPRINTF(("uvideo: pipe %p\n", bx->bx_pipe));
 
 		error = usbd_create_xfer(bx->bx_pipe, vs->vs_max_payload_size,
-		    USBD_SHORT_XFER_OK, 0, &bx->bx_xfer);
+		    0, 0, &bx->bx_xfer);
 		if (error) {
 			DPRINTF(("uvideo: couldn't allocate xfer\n"));
 			return error;

Reply via email to