Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/dev/usb/if_upl.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/dev/usb/if_upl.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.36
retrieving revision 1.36.4.1
diff -u -p -r1.36 -r1.36.4.1
--- src/sys/dev/usb/if_upl.c	2010/01/19 22:07:44	1.36
+++ src/sys/dev/usb/if_upl.c	2010/05/30 05:17:44	1.36.4.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_upl.c,v 1.36 2010/01/19 22:07:44 pooka Exp $	*/
+/*	$NetBSD: if_upl.c,v 1.36.4.1 2010/05/30 05:17:44 rmind Exp $	*/
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.36 2010/01/19 22:07:44 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.36.4.1 2010/05/30 05:17:44 rmind Exp $");
 
 #include "opt_inet.h"
 #include "rnd.h"
@@ -303,7 +303,7 @@ USB_ATTACH(upl)
 	if_attach(ifp);
 	if_alloc_sadl(ifp);
 
-	bpf_ops->bpf_attach(ifp, DLT_RAW, 0, &ifp->if_bpf);
+	bpf_attach(ifp, DLT_RAW, 0);
 #if NRND > 0
 	rnd_attach_source(&sc->sc_rnd_source, USBDEVNAME(sc->sc_dev),
 	    RND_TYPE_NET, 0);
@@ -340,7 +340,7 @@ USB_DETACH(upl)
 #if NRND > 0
 	rnd_detach_source(&sc->sc_rnd_source);
 #endif
-	bpf_ops->bpf_detach(ifp);
+	bpf_detach(ifp);
 
 	if_detach(ifp);
 
@@ -538,9 +538,7 @@ upl_rxeof(usbd_xfer_handle xfer, usbd_pr
 	 * a broadcast packet, multicast packet, matches our ethernet
 	 * address or the interface is in promiscuous mode.
 	 */
-	if (ifp->if_bpf) {
-		bpf_ops->bpf_mtap(ifp->if_bpf, m);
-	}
+	bpf_mtap(ifp, m);
 
 	DPRINTFN(10,("%s: %s: deliver %d\n", USBDEVNAME(sc->sc_dev),
 		    __func__, m->m_len));
@@ -680,8 +678,7 @@ upl_start(struct ifnet *ifp)
 	 * If there's a BPF listener, bounce a copy of this frame
 	 * to him.
 	 */
-	if (ifp->if_bpf)
-		bpf_ops->bpf_mtap(ifp->if_bpf, m_head);
+	bpf_mtap(ifp, m_head);
 
 	ifp->if_flags |= IFF_OACTIVE;