right include

Author: Emmankoko

sys/altq/altq_cbq.c

@@ -313,7 +313,7 @@ cbq_add_queue(struct npf_altq *a)
 	struct rm_class	*borrow, *parent;
 	cbq_state_t	*cbqp;
 	struct rm_class	*cl;
-	struct cbq_opts	*opts;
+	struct npf_cbq_opts	*opts;
 	int		i, error;
 
 	if ((cbqp = a->altq_disc) == NULL)
@@ -335,7 +335,7 @@ cbq_add_queue(struct npf_altq *a)
 			return (EINVAL);
 	}
 
-	opts = &a->pq_u.cbq_opts;
+	opts = &a->pq_u.npf_cbq_opts;
 	/* check parameters */
 	if (a->priority >= CBQ_MAXPRI)
 		return EINVAL;

sys/altq/altq_hfsc.c

@@ -242,13 +242,13 @@ hfsc_add_queue(struct npf_altq *a)
 {
 	struct hfsc_if *hif;
 	struct hfsc_class *cl, *parent;
-	struct hfsc_opts *opts;
+	struct npf_hfsc_opts *opts;
 	struct service_curve rtsc, lssc, ulsc;
 
 	if ((hif = a->altq_disc) == NULL)
 		return EINVAL;
 
-	opts = &a->pq_u.hfsc_opts;
+	opts = &a->pq_u.npf_hfsc_opts;
 
 	if (a->parent_qid == HFSC_NULLCLASS_HANDLE &&
 	    hif->hif_rootclass == NULL)

sys/altq/altq_priq.c

@@ -180,7 +180,7 @@ priq_add_queue(struct npf_altq *a)
 		return EBUSY;
 
 	cl = priq_class_create(pif, a->priority, a->qlimit,
-	    a->pq_u.priq_opts.flags, a->qid);
+	    a->pq_u.npf_priq_opts.flags, a->qid);
 	if (cl == NULL)
 		return ENOMEM;