1 files changed, 7 insertions, 7 deletions

diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index e54311c..a96bf35 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -470,11 +470,11 @@ usbioctl(dev_t devt, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
 	case USB_REQUEST:
 	{
 		struct usb_ctl_request *ur = (void *)data;
-		int len = UGETW(ur->request.wLength);
+		int len = UGETW(ur->ucr_request.wLength);
 		struct iovec iov;
 		struct uio uio;
 		void *ptr = 0;
-		int addr = ur->addr;
+		int addr = ur->ucr_addr;
 		usbd_status err;
 		int error = 0;
 
@@ -485,7 +485,7 @@ usbioctl(dev_t devt, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
 		    sc->sc_bus->devices[addr] == 0)
 			return (EINVAL);
 		if (len != 0) {
-			iov.iov_base = (caddr_t)ur->data;
+			iov.iov_base = (caddr_t)ur->ucr_data;
 			iov.iov_len = len;
 			uio.uio_iov = &iov;
 			uio.uio_iovcnt = 1;
@@ -493,7 +493,7 @@ usbioctl(dev_t devt, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
 			uio.uio_offset = 0;
 			uio.uio_segflg = UIO_USERSPACE;
 			uio.uio_rw =
-				ur->request.bmRequestType & UT_READ ?
+				ur->ucr_request.bmRequestType & UT_READ ?
 				UIO_READ : UIO_WRITE;
 			uio.uio_procp = p;
 			ptr = malloc(len, M_TEMP, M_WAITOK);
@@ -504,7 +504,7 @@ usbioctl(dev_t devt, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
 			}
 		}
 		err = usbd_do_request_flags(sc->sc_bus->devices[addr],
-			  &ur->request, ptr, ur->flags, &ur->actlen);
+			  &ur->ucr_request, ptr, ur->ucr_flags, &ur->ucr_actlen);
 		if (err) {
 			error = EIO;
 			goto ret;
@@ -525,7 +525,7 @@ usbioctl(dev_t devt, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
 	case USB_DEVICEINFO:
 	{
 		struct usb_device_info *di = (void *)data;
-		int addr = di->addr;
+		int addr = di->udi_addr;
 		usbd_device_handle dev;
 
 		if (addr < 1 || addr >= USB_MAX_DEVICES)
@@ -679,7 +679,7 @@ usb_add_event(int type, struct usb_event *uep)
 		for (ueqi = TAILQ_FIRST(&usb_events); ueqi; ueqi = ueqi_next) {
 			ueqi_next = TAILQ_NEXT(ueqi, next);
 			if (ueqi->ue.u.ue_driver.ue_cookie.cookie ==
-			    uep->u.ue_device.cookie.cookie) {
+			    uep->u.ue_device.udi_cookie.cookie) {
 				TAILQ_REMOVE(&usb_events, ueqi, next);
 				free(ueqi, M_USBDEV);
 				usb_nevents--;