From owner-svn-src-all@FreeBSD.ORG  Mon Oct 17 15:54:20 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7D9811065689;
	Mon, 17 Oct 2011 15:54:20 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 52D708FC21;
	Mon, 17 Oct 2011 15:54:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p9HFsKwY030098;
	Mon, 17 Oct 2011 15:54:20 GMT
	(envelope-from hselasky@svn.freebsd.org)
Received: (from hselasky@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9HFsKng030096;
	Mon, 17 Oct 2011 15:54:20 GMT
	(envelope-from hselasky@svn.freebsd.org)
Message-Id: <201110171554.p9HFsKng030096@svn.freebsd.org>
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Mon, 17 Oct 2011 15:54:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226474 - head/usr.sbin/usbdump
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Mon, 17 Oct 2011 15:54:20 -0000

Author: hselasky
Date: Mon Oct 17 15:54:20 2011
New Revision: 226474
URL: http://svn.freebsd.org/changeset/base/226474

Log:
  Make the usbdump utility work again by using the correct BPF structures.
  
  MFC after:	3 days

Modified:
  head/usr.sbin/usbdump/usbdump.c

Modified: head/usr.sbin/usbdump/usbdump.c
==============================================================================
--- head/usr.sbin/usbdump/usbdump.c	Mon Oct 17 15:25:38 2011	(r226473)
+++ head/usr.sbin/usbdump/usbdump.c	Mon Oct 17 15:54:20 2011	(r226474)
@@ -283,7 +283,7 @@ hexdump(const uint8_t *region, uint32_t 
 }
 
 static void
-print_apacket(const struct bpf_xhdr *hdr, const uint8_t *ptr, int ptr_len)
+print_apacket(const struct bpf_hdr *hdr, const uint8_t *ptr, int ptr_len)
 {
 	struct tm *tm;
 	struct usbpf_pkthdr up_temp;
@@ -318,8 +318,8 @@ print_apacket(const struct bpf_xhdr *hdr
 	up->up_packet_count = le32toh(up->up_packet_count);
 	up->up_endpoint = le32toh(up->up_endpoint);
 
-	tv.tv_sec = hdr->bh_tstamp.bt_sec;
-	tv.tv_usec = hdr->bh_tstamp.bt_frac;
+	tv.tv_sec = hdr->bh_tstamp.tv_sec;
+	tv.tv_usec = hdr->bh_tstamp.tv_usec;
 	tm = localtime(&tv.tv_sec);
 
 	len = strftime(buf, sizeof(buf), "%H:%M:%S", tm);
@@ -386,12 +386,12 @@ print_apacket(const struct bpf_xhdr *hdr
 static void
 print_packets(uint8_t *data, const int datalen)
 {
-	const struct bpf_xhdr *hdr;
+	const struct bpf_hdr *hdr;
 	uint8_t *ptr;
 	uint8_t *next;
 
 	for (ptr = data; ptr < (data + datalen); ptr = next) {
-		hdr = (const struct bpf_xhdr *)ptr;
+		hdr = (const struct bpf_hdr *)ptr;
 		next = ptr + BPF_WORDALIGN(hdr->bh_hdrlen + hdr->bh_caplen);
 
 		if (w_arg == NULL) {