From owner-svn-src-user@FreeBSD.ORG Thu Oct 14 20:26:19 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EF4ED1065675; Thu, 14 Oct 2010 20:26:19 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DE8278FC1C; Thu, 14 Oct 2010 20:26:19 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9EKQJB1036012; Thu, 14 Oct 2010 20:26:19 GMT (envelope-from weongyo@svn.freebsd.org) Received: (from weongyo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9EKQJYL036010; Thu, 14 Oct 2010 20:26:19 GMT (envelope-from weongyo@svn.freebsd.org) Message-Id: <201010142026.o9EKQJYL036010@svn.freebsd.org> From: Weongyo Jeong Date: Thu, 14 Oct 2010 20:26:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r213850 - user/weongyo/usb/sys/dev/usb X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Oct 2010 20:26:20 -0000 Author: weongyo Date: Thu Oct 14 20:26:19 2010 New Revision: 213850 URL: http://svn.freebsd.org/changeset/base/213850 Log: Uses USB_PAGE_SIZE instead of defining the new one. Modified: user/weongyo/usb/sys/dev/usb/usb_pf.c Modified: user/weongyo/usb/sys/dev/usb/usb_pf.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/usb_pf.c Thu Oct 14 20:18:39 2010 (r213849) +++ user/weongyo/usb/sys/dev/usb/usb_pf.c Thu Oct 14 20:26:19 2010 (r213850) @@ -1694,7 +1694,6 @@ usbpf_tap(struct usbpf_if *uif, u_char * void usbpf_xfertap(struct usb_xfer *xfer, int type) { -#define USBPF_PAGE_SIZE (4 * 1024) struct usb_endpoint *ep = xfer->endpoint; struct usb_page_search res; struct usb_xfer_root *info = xfer->xroot; @@ -1709,13 +1708,13 @@ usbpf_xfertap(struct usb_xfer *xfer, int * really inefficient. Copying usbpf_pkthdr and data is for USB packet * read filter to pass a virtually linear buffer. */ - buf = ptr = malloc(sizeof(struct usbpf_pkthdr) + (USBPF_PAGE_SIZE * 5), + buf = ptr = malloc(sizeof(struct usbpf_pkthdr) + (USB_PAGE_SIZE * 5), M_USBPF, M_NOWAIT); if (buf == NULL) { printf("usbpf_xfertap: out of memory\n"); /* XXX */ return; } - end = buf + sizeof(struct usbpf_pkthdr) + (USBPF_PAGE_SIZE * 5); + end = buf + sizeof(struct usbpf_pkthdr) + (USB_PAGE_SIZE * 5); bzero(ptr, sizeof(struct usbpf_pkthdr)); up = (struct usbpf_pkthdr *)ptr;