Module Name: src
Committed By: skrll
Date: Sat Apr 30 14:31:39 UTC 2016
Modified Files:
src/sys/dev/usb: usb_mem.c
Log Message:
Make USB_FRAG_DMA_WORKAROUND compile
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/dev/usb/usb_mem.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/usb_mem.c
diff -u src/sys/dev/usb/usb_mem.c:1.67 src/sys/dev/usb/usb_mem.c:1.68
--- src/sys/dev/usb/usb_mem.c:1.67 Sat Apr 23 10:15:32 2016
+++ src/sys/dev/usb/usb_mem.c Sat Apr 30 14:31:39 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_mem.c,v 1.67 2016/04/23 10:15:32 skrll Exp $ */
+/* $NetBSD: usb_mem.c,v 1.68 2016/04/30 14:31:39 skrll Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_mem.c,v 1.67 2016/04/23 10:15:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_mem.c,v 1.68 2016/04/30 14:31:39 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -336,7 +336,7 @@ usb_allocmem_flags(struct usbd_bus *bus,
p->udma_block = f->ufd_block;
p->udma_offs = f->ufd_offs;
#ifdef USB_FRAG_DMA_WORKAROUND
- p->offs += USB_MEM_SMALL;
+ p->udma_offs += USB_MEM_SMALL;
#endif
LIST_REMOVE(f, ufd_next);
mutex_exit(&usb_blk_lock);
@@ -373,7 +373,7 @@ usb_freemem(struct usbd_bus *bus, usb_dm
f->ufd_block = p->udma_block;
f->ufd_offs = p->udma_offs;
#ifdef USB_FRAG_DMA_WORKAROUND
- f->offs -= USB_MEM_SMALL;
+ f->ufd_offs -= USB_MEM_SMALL;
#endif
LIST_INSERT_HEAD(&usb_frag_freelist, f, ufd_next);
mutex_exit(&usb_blk_lock);