From owner-svn-src-all@FreeBSD.ORG  Wed Jan 22 17:50:44 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5109F1C3;
 Wed, 22 Jan 2014 17:50:44 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3D5E51161;
 Wed, 22 Jan 2014 17:50:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0MHoiEo088367;
 Wed, 22 Jan 2014 17:50:44 GMT
 (envelope-from hselasky@svn.freebsd.org)
Received: (from hselasky@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0MHoi9V088366;
 Wed, 22 Jan 2014 17:50:44 GMT
 (envelope-from hselasky@svn.freebsd.org)
Message-Id: <201401221750.s0MHoi9V088366@svn.freebsd.org>
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Wed, 22 Jan 2014 17:50:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r261033 - head/sys/dev/usb
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Jan 2014 17:50:44 -0000

Author: hselasky
Date: Wed Jan 22 17:50:43 2014
New Revision: 261033
URL: http://svnweb.freebsd.org/changeset/base/261033

Log:
  We are using the old callout API and should also add one extra tick in
  the FreeBSD 10 case.
  
  Suggested by:	mav @
  MFC after:	1 week

Modified:
  head/sys/dev/usb/usb_freebsd.h

Modified: head/sys/dev/usb/usb_freebsd.h
==============================================================================
--- head/sys/dev/usb/usb_freebsd.h	Wed Jan 22 17:15:17 2014	(r261032)
+++ head/sys/dev/usb/usb_freebsd.h	Wed Jan 22 17:50:43 2014	(r261033)
@@ -51,11 +51,7 @@
 #define	USB_HAVE_FIXED_PORT 0
 
 /* define zero ticks callout value */
-#if (__FreeBSD_version >= 1000029)
-#define	USB_CALLOUT_ZERO_TICKS 0
-#else
 #define	USB_CALLOUT_ZERO_TICKS 1
-#endif
 
 #define	USB_TD_GET_PROC(td) (td)->td_proc
 #define	USB_PROC_GET_GID(td) (td)->p_pgid