Remove some altq tentacles.

ok pelikan@, henning@

8 files changed, 12 insertions, 85 deletions

diff --git a/share/man/man9/mbuf.9 b/share/man/man9/mbuf.9
index 70e9e1e5890..fd7a8b9b1d4 100644
--- a/share/man/man9/mbuf.9
+++ b/share/man/man9/mbuf.9
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: mbuf.9,v 1.71 2014/04/14 09:06:41 mpi Exp $
+.\"     $OpenBSD: mbuf.9,v 1.72 2014/04/22 14:41:03 mpi Exp $
 .\"
 .\" Copyright (c) 2001 Jean-Jacques Bernard-Gundol <jjbg@openbsd.org>
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: April 14 2014 $
+.Dd $Mdocdate: April 22 2014 $
 .Dt MBUF 9
 .Os
 .Sh NAME
@@ -124,7 +124,6 @@ struct pkthdr {
 };
 
 struct pkthdr_pf {
-	void	 *hdr;
 	void	 *statekey;
 	u_int32_t qid;
 	u_int16_t tag;
diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c
index 11ec84bea9f..c3f8f6aef45 100644
--- a/sys/dev/pci/if_de.c
+++ b/sys/dev/pci/if_de.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_de.c,v 1.113 2014/04/19 12:25:03 henning Exp $	*/
+/*	$OpenBSD: if_de.c,v 1.114 2014/04/22 14:41:03 mpi Exp $	*/
 /*	$NetBSD: if_de.c,v 1.58 1998/01/12 09:39:58 thorpej Exp $	*/
 
 /*-
@@ -4223,7 +4223,7 @@ tulip_ifioctl(struct ifnet * ifp, u_long cmd, caddr_t data)
 
 /*
  * the original dequeueing policy is dequeue-and-prepend if something
- * goes wrong.  when altq is used, it is changed to peek-and-dequeue.
+ * goes wrong.
  * the modification becomes a bit complicated since tulip_txput() might
  * copy and modify the mbuf passed.
  */
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index d6f253f0126..47c6ffc310d 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipc_mbuf.c,v 1.182 2014/04/21 11:10:54 henning Exp $	*/
+/*	$OpenBSD: uipc_mbuf.c,v 1.183 2014/04/22 14:41:03 mpi Exp $	*/
 /*	$NetBSD: uipc_mbuf.c,v 1.15.4.1 1996/06/13 17:11:44 cgd Exp $	*/
 
 /*
@@ -596,7 +596,6 @@ m_defrag(struct mbuf *m, int how)
 		memcpy(m->m_data, m0->m_data, m0->m_len);
 	}
 	m->m_pkthdr.len = m->m_len = m0->m_len;
-	m->m_pkthdr.pf.hdr = NULL;	/* altq will cope */
 
 	m0->m_flags &= ~(M_EXT|M_CLUSTER);	/* cluster is gone */
 	m_free(m0);
@@ -1364,8 +1363,6 @@ m_print(void *v,
 		    m->m_pkthdr.csum_flags, MCS_BITS);
 		(*pr)("m_pkthdr.ether_vtag: %hu\tm_ptkhdr.ph_rtableid: %u\n",
 		    m->m_pkthdr.ether_vtag, m->m_pkthdr.ph_rtableid);
-		(*pr)("m_pkthdr.pf.hdr: %p\n",
-		    m->m_pkthdr.pf.hdr);
 		(*pr)("m_pkthdr.pf.statekey: %p\tm_pkthdr.pf.inp %p\n",
 		    m->m_pkthdr.pf.statekey, m->m_pkthdr.pf.inp);
 		(*pr)("m_pkthdr.pf.qid: %u\tm_pkthdr.pf.tag: %hu\n",
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index 96b348a19d5..3e9a6500972 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_tun.c,v 1.123 2014/04/18 15:20:00 henning Exp $	*/
+/*	$OpenBSD: if_tun.c,v 1.124 2014/04/22 14:41:03 mpi Exp $	*/
 /*	$NetBSD: if_tun.c,v 1.24 1996/05/07 02:40:48 thorpej Exp $	*/
 
 /*
@@ -1090,9 +1090,6 @@ filt_tunwrite(struct knote *kn, long hint)
 
 /*
  * Start packet transmission on the interface.
- * when the interface queue is rate-limited by ALTQ or TBR,
- * if_start is needed to drain packets from the queue in order
- * to notify readers when outgoing packets become ready.
  * In layer 2 mode this function is called from ether_output.
  */
 void
diff --git a/sys/net/pf.c b/sys/net/pf.c
index ad4380f5459..6776b283e77 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf.c,v 1.875 2014/04/21 12:22:25 henning Exp $ */
+/*	$OpenBSD: pf.c,v 1.876 2014/04/22 14:41:03 mpi Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -104,15 +104,8 @@ struct pf_queuehead	 pf_queues[2];
 struct pf_queuehead	*pf_queues_active;
 struct pf_queuehead	*pf_queues_inactive;
 
-struct pf_altqqueue	 pf_altqs[2];
-struct pf_altqqueue	*pf_altqs_active;
-struct pf_altqqueue	*pf_altqs_inactive;
 struct pf_status	 pf_status;
 
-u_int32_t		 ticket_altqs_active;
-u_int32_t		 ticket_altqs_inactive;
-int			 altqs_inactive_open;
-
 MD5_CTX			 pf_tcp_secret_ctx;
 u_char			 pf_tcp_secret[16];
 int			 pf_tcp_secret_init;
@@ -143,7 +136,7 @@ union pf_headers {
 
 struct pool		 pf_src_tree_pl, pf_rule_pl, pf_queue_pl;
 struct pool		 pf_state_pl, pf_state_key_pl, pf_state_item_pl;
-struct pool		 pf_altq_pl, pf_rule_item_pl, pf_sn_item_pl;
+struct pool		 pf_rule_item_pl, pf_sn_item_pl;
 struct pool		 hfsc_class_pl, hfsc_classq_pl, hfsc_internal_sc_pl;
 
 void			 pf_init_threshold(struct pf_threshold *, u_int32_t,
diff --git a/sys/net/pf_ioctl.c b/sys/net/pf_ioctl.c
index 2e68ed18b9a..5ad762c1f18 100644
--- a/sys/net/pf_ioctl.c
+++ b/sys/net/pf_ioctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf_ioctl.c,v 1.271 2014/04/19 12:59:53 henning Exp $ */
+/*	$OpenBSD: pf_ioctl.c,v 1.272 2014/04/22 14:41:03 mpi Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -157,8 +157,6 @@ pfattach(int num)
 	    "pfstitem", NULL);
 	pool_init(&pf_rule_item_pl, sizeof(struct pf_rule_item), 0, 0, 0,
 	    "pfruleitem", NULL);
-	pool_init(&pf_altq_pl, sizeof(struct pf_altq), 0, 0, 0, "pfaltq",
-	    &pool_allocator_nointr);
 	pool_init(&pf_queue_pl, sizeof(struct pf_queuespec), 0, 0, 0, 
 	    "pfqueue", NULL);
 	pool_init(&hfsc_class_pl, sizeof(struct hfsc_class), 0, 0, PR_WAITOK,
@@ -185,10 +183,6 @@ pfattach(int num)
 	TAILQ_INIT(&pf_queues[1]);
 	pf_queues_active = &pf_queues[0];
 	pf_queues_inactive = &pf_queues[1];
-	TAILQ_INIT(&pf_altqs[0]);
-	TAILQ_INIT(&pf_altqs[1]);
-	pf_altqs_active = &pf_altqs[0];
-	pf_altqs_inactive = &pf_altqs[1];
 	TAILQ_INIT(&state_list);
 
 	/* default rule should never be garbage collected */
@@ -2406,7 +2400,6 @@ pf_rule_copyin(struct pf_rule *from, struct pf_rule *to,
 	to->max_src_conn_rate.limit = from->max_src_conn_rate.limit;
 	to->max_src_conn_rate.seconds = from->max_src_conn_rate.seconds;
 
-	/* set queue IDs. little ugly due to both altq and new system... */
 	if (to->qname[0] != 0) {
 		if ((to->qid = pf_qname2qid(to->qname, 0)) == 0)
 			return (EBUSY);
diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h
index 07bd07135d1..30c24026056 100644
--- a/sys/net/pfvar.h
+++ b/sys/net/pfvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfvar.h,v 1.398 2014/04/19 12:59:53 henning Exp $ */
+/*	$OpenBSD: pfvar.h,v 1.399 2014/04/22 14:41:03 mpi Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -1483,34 +1483,6 @@ struct hfsc_opts {
 	int		flags;
 };
 
-struct pf_altq {
-	char			 ifname[IFNAMSIZ];
-
-	void			*altq_disc;	/* discipline-specific state */
-	TAILQ_ENTRY(pf_altq)	 entries;
-
-	/* scheduler spec */
-	u_int8_t		 scheduler;	/* scheduler type */
-	u_int16_t		 tbrsize;	/* tokenbucket regulator size */
-	u_int32_t		 ifbandwidth;	/* interface bandwidth */
-
-	/* queue spec */
-	char			 qname[PF_QNAME_SIZE];	/* queue name */
-	char			 parent[PF_QNAME_SIZE];	/* parent name */
-	u_int32_t		 parent_qid;	/* parent queue id */
-	u_int32_t		 bandwidth;	/* queue bandwidth */
-	u_int8_t		 priority;	/* priority */
-	u_int16_t		 qlimit;	/* queue size limit */
-	u_int16_t		 flags;		/* misc flags */
-	union {
-		struct cbq_opts		 cbq_opts;
-		struct priq_opts	 priq_opts;
-		struct hfsc_opts	 hfsc_opts;
-	} pq_u;
-
-	u_int32_t		 qid;		/* return value */
-};
-
 struct pf_tagname {
 	TAILQ_ENTRY(pf_tagname)	entries;
 	char			name[PF_TAG_NAME_SIZE];
@@ -1614,21 +1586,6 @@ struct pfioc_limit {
 	unsigned	 limit;
 };
 
-struct pfioc_altq {
-	u_int32_t	 action;
-	u_int32_t	 ticket;
-	u_int32_t	 nr;
-	struct pf_altq	 altq;
-};
-
-struct pfioc_altqstats {
-	u_int32_t	 ticket;
-	u_int32_t	 nr;
-	void		*buf;
-	int		 nbytes;
-	u_int8_t	 scheduler;
-};
-
 struct pfioc_ruleset {
 	u_int32_t	 nr;
 	char		 path[MAXPATHLEN];
@@ -1779,15 +1736,7 @@ TAILQ_HEAD(pf_queuehead, pf_queuespec);
 extern struct pf_queuehead		  pf_queues[2];
 extern struct pf_queuehead		 *pf_queues_active, *pf_queues_inactive;
 
-TAILQ_HEAD(pf_altqqueue, pf_altq);
-extern struct pf_altqqueue		  pf_altqs[2];
-
-extern u_int32_t		 ticket_altqs_active;
-extern u_int32_t		 ticket_altqs_inactive;
-extern int			 altqs_inactive_open;
 extern u_int32_t		 ticket_pabuf;
-extern struct pf_altqqueue	*pf_altqs_active;
-extern struct pf_altqqueue	*pf_altqs_inactive;
 extern int			 pf_free_queues(struct pf_queuehead *,
 				    struct ifnet *);
 extern int			 pf_remove_queues(struct ifnet *);
@@ -1798,7 +1747,7 @@ extern void			 pf_tbladdr_copyout(struct pf_addr_wrap *);
 extern void			 pf_calc_skip_steps(struct pf_rulequeue *);
 extern struct pool		 pf_src_tree_pl, pf_sn_item_pl, pf_rule_pl;
 extern struct pool		 pf_state_pl, pf_state_key_pl, pf_state_item_pl,
-				    pf_altq_pl, pf_rule_item_pl, pf_queue_pl;
+				    pf_rule_item_pl, pf_queue_pl;
 extern struct pool		 pf_state_scrub_pl;
 extern struct pool		 hfsc_class_pl, hfsc_classq_pl,
 				    hfsc_internal_sc_pl;
diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h
index 76c88a3f7b9..e99fe9fe4d7 100644
--- a/sys/sys/mbuf.h
+++ b/sys/sys/mbuf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mbuf.h,v 1.175 2014/04/14 09:06:42 mpi Exp $	*/
+/*	$OpenBSD: mbuf.h,v 1.176 2014/04/22 14:41:03 mpi Exp $	*/
 /*	$NetBSD: mbuf.h,v 1.19 1996/02/09 18:25:14 christos Exp $	*/
 
 /*
@@ -82,7 +82,6 @@ struct pf_state_key;
 struct inpcb;
 
 struct pkthdr_pf {
-	void		*hdr;		/* saved hdr pos in mbuf, for ECN */
 	struct pf_state_key *statekey;	/* pf stackside statekey */
 	struct inpcb	*inp;		/* connected pcb for outgoing packet */
 	u_int32_t	 qid;		/* queue id */