the 2nd round of the qid assignment change.

make the semantics in line with the tag assignment, which simplifies
the id management in pf.

ok, henning@

1 files changed, 1 insertions, 32 deletions

diff --git a/sys/net/pf.c b/sys/net/pf.c
index 17ee4ffcabd..5ab21c2402e 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf.c,v 1.424 2004/02/10 22:42:57 dhartmei Exp $ */
+/*	$OpenBSD: pf.c,v 1.425 2004/02/19 07:41:45 kjc Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -81,10 +81,6 @@
 #include <netinet6/nd6.h>
 #endif /* INET6 */
 
-#ifdef ALTQ
-#include <altq/if_altq.h>
-#endif
-
 
 #define DPFPRINTF(n, x)	if (pf_status.debug >= (n)) printf x
 
@@ -1058,33 +1054,6 @@ pf_addr_wrap_neq(struct pf_addr_wrap *aw1, struct pf_addr_wrap *aw2)
 }
 
 void
-pf_rule_set_qid(struct pf_rulequeue *rules)
-{
-	struct pf_rule *rule;
-
-	TAILQ_FOREACH(rule, rules, entries)
-		if (rule->qname[0] != 0) {
-			rule->qid = pf_qname_to_qid(rule->qname);
-			if (rule->pqname[0] != 0)
-				rule->pqid = pf_qname_to_qid(rule->pqname);
-			else
-				rule->pqid = rule->qid;
-		}
-}
-
-u_int32_t
-pf_qname_to_qid(char *qname)
-{
-	struct pf_altq		*altq;
-
-	TAILQ_FOREACH(altq, pf_altqs_active, entries)
-		if (!strcmp(altq->qname, qname))
-			return (altq->qid);
-
-	return (0);
-}
-
-void
 pf_update_anchor_rules()
 {
 	struct pf_rule	*rule;