Index: bpf.c
===================================================================
RCS file: /cvs/src/sys/net/bpf.c,v
retrieving revision 1.136
diff -u -p -r1.136 bpf.c
--- bpf.c	29 Mar 2016 10:38:27 -0000	1.136
+++ bpf.c	30 Mar 2016 00:12:41 -0000
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bpf.c,v 1.136 2016/03/29 10:38:27 dlg Exp $	*/
+/*	$OpenBSD: bpf.c,v 1.116 2015/01/29 19:44:32 tedu Exp $	*/
 /*	$NetBSD: bpf.c,v 1.33 1997/02/21 23:59:35 thorpej Exp $	*/
 
 /*
@@ -859,14 +859,6 @@ bpfioctl(dev_t dev, u_long cmd, caddr_t 
 		    (BPF_DIRECTION_IN|BPF_DIRECTION_OUT);
 		break;
 
-	case BIOCGQUEUE:	/* get queue */
-		*(u_int *)addr = d->bd_queue;
-		break;
-
-	case BIOCSQUEUE:	/* set queue */
-		d->bd_queue = *(u_int *)addr;
-		break;
-
 	case FIONBIO:		/* Non-blocking I/O */
 		if (*(int *)addr)
 			d->bd_rtout = -1;
@@ -1244,8 +1236,6 @@ _bpf_mtap(caddr_t arg, struct mbuf *m, u
 		atomic_inc_long(&d->bd_rcount);
 
 		if ((direction & d->bd_dirfilt) != 0)
-			slen = 0;
-		else if (d->bd_queue && m->m_pkthdr.pf.qid != d->bd_queue)
 			slen = 0;
 		else {
 			struct bpf_program *bf;
Index: bpfdesc.h
===================================================================
RCS file: /cvs/src/sys/net/bpfdesc.h,v
retrieving revision 1.29
diff -u -p -r1.29 bpfdesc.h
--- bpfdesc.h	3 Dec 2015 16:27:32 -0000	1.29
+++ bpfdesc.h	30 Mar 2016 00:12:41 -0000
@@ -80,7 +80,6 @@ struct bpf_d {
 	u_char		bd_locked;	/* true if descriptor is locked */
 	u_char		bd_fildrop;	/* true if filtered packets will be dropped */
 	u_char		bd_dirfilt;	/* direction filter */
-	u_int		bd_queue;	/* the queue the user wants to watch (0 == all) */
 	int		bd_hdrcmplt;	/* false to fill in src lladdr automatically */
 	int		bd_async;	/* non-zero if packet reception should generate signal */
 	int		bd_sig;		/* signal to send upon packet reception */