 @@ -1,14 +1,14 @@
-/*	$NetBSD: altq_hfsc.c,v 1.24 2008/06/18 09:06:27 yamt Exp $	*/
+/*	$NetBSD: altq_hfsc.c,v 1.25 2016/01/22 18:19:54 christos Exp $	*/
 /*	$KAME: altq_hfsc.c,v 1.26 2005/04/13 03:44:24 suz Exp $	*/
 /*
  * Copyright (c) 1997-1999 Carnegie Mellon University. All Rights Reserved.
+ *
  * Permission to use, copy, modify, and distribute this software and
  * its documentation is hereby granted (including for commercial or
  * for-profit use), provided that both the copyright notice and this
  * permission notice appear in all copies of the software, derivative
  * works, or modified versions, and any portions thereof.
+ *
  * THIS SOFTWARE IS EXPERIMENTAL AND IS KNOWN TO HAVE BUGS, SOME OF
  * WHICH MAY HAVE SERIOUS CONSEQUENCES.  CARNEGIE MELLON PROVIDES THIS
 @@ -33,27 +33,27 @@
 /*
  * H-FSC is described in Proceedings of SIGCOMM'97,
  * "A Hierarchical Fair Service Curve Algorithm for Link-Sharing,
  * Real-Time and Priority Service"
  * by Ion Stoica, Hui Zhang, and T. S. Eugene Ng.
+ *
  * Oleg Cherevko <olwi@aq.ml.com.ua> added the upperlimit for link-sharing.
  * when a class has an upperlimit, the fit-time is computed from the
  * upperlimit service curve.  the link-sharing scheduler does not schedule
  * a class whose fit-time exceeds the current time.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_hfsc.c,v 1.24 2008/06/18 09:06:27 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_hfsc.c,v 1.25 2016/01/22 18:19:54 christos Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_altq.h"
 #include "opt_inet.h"
 #include "pf.h"
 #endif
 #ifdef ALTQ_HFSC  /* hfsc is enabled by ALTQ_HFSC option in opt_altq.h */
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 @@ -136,27 +136,27 @@ static void		rtsc_init(struct runtime_sc
 			    u_int64_t, u_int64_t);
 static u_int64_t	rtsc_y2x(struct runtime_sc *, u_int64_t);
 static u_int64_t	rtsc_x2y(struct runtime_sc *, u_int64_t);
 static void		rtsc_min(struct runtime_sc *, struct internal_sc *,
 			    u_int64_t, u_int64_t);
 static void			 get_class_stats(struct hfsc_classstats *,
 				    struct hfsc_class *);
 static struct hfsc_class	*clh_to_clp(struct hfsc_if *, u_int32_t);
 #ifdef ALTQ3_COMPAT
 static struct hfsc_if *hfsc_attach(struct ifaltq *, u_int);
-static int hfsc_detach(struct hfsc_if *);
+static void hfsc_detach(struct hfsc_if *);
 static int hfsc_class_modify(struct hfsc_class *, struct service_curve *,
     struct service_curve *, struct service_curve *);
 static int hfsccmd_if_attach(struct hfsc_attach *);
 static int hfsccmd_if_detach(struct hfsc_interface *);
 static int hfsccmd_add_class(struct hfsc_add_class *);
 static int hfsccmd_delete_class(struct hfsc_delete_class *);
 static int hfsccmd_modify_class(struct hfsc_modify_class *);
 static int hfsccmd_add_filter(struct hfsc_add_filter *);
 static int hfsccmd_delete_filter(struct hfsc_delete_filter *);
 static int hfsccmd_class_stats(struct hfsc_class_stats *);
 altqdev_decl(hfsc);
 @@ -1717,51 +1717,49 @@ hfsc_attach(struct ifaltq *ifq, u_int ba
 		free(hif, M_DEVBUF);
 		return NULL;
+	}
 	hif->hif_ifq = ifq;
 	/* add this state to the hfsc list */
 	hif->hif_next = hif_list;
 	hif_list = hif;
 	return (hif);
+}
-static int
+static void
 hfsc_detach(struct hfsc_if *hif)
+{
 	(void)hfsc_clear_interface(hif);
 	(void)hfsc_class_destroy(hif->hif_rootclass);
 	/* remove this interface from the hif list */
 	if (hif_list == hif)
 		hif_list = hif->hif_next;
 	else {
 		struct hfsc_if *h;
 		for (h = hif_list; h != NULL; h = h->hif_next)
 			if (h->hif_next == hif) {
 				h->hif_next = hif->hif_next;
 				break;
+			}
 		ASSERT(h != NULL);
+	}
 	ellist_destroy(hif->hif_eligible);
 	free(hif, M_DEVBUF);
 	return (0);
+}
 static int
 hfsc_class_modify(struct hfsc_class *cl, struct service_curve *rsc,
     struct service_curve *fsc, struct service_curve *usc)
+{
 	struct internal_sc *rsc_tmp, *fsc_tmp, *usc_tmp;
 	u_int64_t cur_time;
 	int s;
 	rsc_tmp = fsc_tmp = usc_tmp = NULL;
 	if (rsc != NULL && (rsc->m1 != 0 || rsc->m2 != 0) &&
 	    cl->cl_rsc == NULL) {
 @@ -1870,41 +1868,44 @@ hfscopen(dev_t dev, int flag, int fmt,
 		printf("hfsc: no CPU clock available!\n");
 		return (ENXIO);
+	}
 	/* everything will be done when the queueing scheme is attached. */
 	return 0;
+}
 int
 hfscclose(dev_t dev, int flag, int fmt,
     struct lwp *l)
+{
 	struct hfsc_if *hif;
 	int err, error = 0;
 	while ((hif = hif_list) != NULL) {
 		/* destroy all */
 		if (ALTQ_IS_ENABLED(hif->hif_ifq))
 			altq_disable(hif->hif_ifq);
-		err = altq_detach(hif->hif_ifq);
+		int error = altq_detach(hif->hif_ifq);
-		if (err == 0)
+		switch (error) {
-			err = hfsc_detach(hif);
+		case 0:
-		if (err != 0 && error == 0)
+		case ENXIO:	/* already disabled */
-			error = err;
+			break;
 		default:
 			return error;
+		}
 		hfsc_detach(hif);
+	}
-	return error;
+	return 0;
+}
 int
 hfscioctl(dev_t dev, ioctlcmd_t cmd, void *addr, int flag,
     struct lwp *l)
+{
 	struct hfsc_if *hif;
 	struct hfsc_interface *ifacep;
 	int	error = 0;
 	/* check super-user privilege */
 	switch (cmd) {
 	case HFSC_GETSTATS:
 @@ -2005,47 +2006,48 @@ hfsccmd_if_attach(struct hfsc_attach *ap
 	if ((ifp = ifunit(ap->iface.hfsc_ifname)) == NULL)
 		return (ENXIO);
 	if ((hif = hfsc_attach(&ifp->if_snd, ap->bandwidth)) == NULL)
 		return (ENOMEM);
 	/*
 	 * set HFSC to this ifnet structure.
 	 */
 	if ((error = altq_attach(&ifp->if_snd, ALTQT_HFSC, hif,
 				 hfsc_enqueue, hfsc_dequeue, hfsc_request,
 				 &hif->hif_classifier, acc_classify)) != 0)
-		(void)hfsc_detach(hif);
+		hfsc_detach(hif);
 	return (error);
+}
 static int
 hfsccmd_if_detach(struct hfsc_interface *ap)
+{
 	struct hfsc_if *hif;
 	int error;
 	if ((hif = altq_lookup(ap->hfsc_ifname, ALTQT_HFSC)) == NULL)
 		return (EBADF);
 	if (ALTQ_IS_ENABLED(hif->hif_ifq))
 		altq_disable(hif->hif_ifq);
 	if ((error = altq_detach(hif->hif_ifq)))
 		return (error);
-	return hfsc_detach(hif);
+	hfsc_detach(hif);
 	return 0;
+}
 static int
 hfsccmd_add_class(struct hfsc_add_class *ap)
+{
 	struct hfsc_if *hif;
 	struct hfsc_class *cl, *parent;
 	int	i;
 	if ((hif = altq_lookup(ap->iface.hfsc_ifname, ALTQT_HFSC)) == NULL)
 		return (EBADF);
 	if (ap->parent_handle == HFSC_NULLCLASS_HANDLE &&

 @@ -1,14 +1,14 @@
-/*	$NetBSD: altq_jobs.c,v 1.7 2014/08/18 03:14:12 riastradh Exp $	*/
+/*	$NetBSD: altq_jobs.c,v 1.8 2016/01/22 18:19:54 christos Exp $	*/
 /*	$KAME: altq_jobs.c,v 1.11 2005/04/13 03:44:25 suz Exp $	*/
 /*
  * Copyright (c) 2001, the Rector and Board of Visitors of the
  * University of Virginia.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms,
  * with or without modification, are permitted provided
  * that the following conditions are met:
+ *
  * Redistributions of source code must retain the above
  * copyright notice, this list of conditions and the following
  * disclaimer.
 @@ -49,27 +49,27 @@
  * Contributed by the Multimedia Networks Group at the University
  * of Virginia.
+ *
  * Papers and additional info can be found at
  * http://qosbox.cs.virginia.edu
+ *
  */
 /*
  * JoBS queue
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_jobs.c,v 1.7 2014/08/18 03:14:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_jobs.c,v 1.8 2016/01/22 18:19:54 christos Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_altq.h"
 #include "opt_inet.h"
 #endif
 #ifdef ALTQ_JOBS  /* jobs is enabled by ALTQ_JOBS option in opt_altq.h */
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 @@ -86,27 +86,27 @@ __KERNEL_RCSID(0, "$NetBSD: altq_jobs.c,
 #include <net/if.h>
 #include <net/if_types.h>
 #include <altq/altq.h>
 #include <altq/altq_conf.h>
 #include <altq/altq_jobs.h>
 #ifdef ALTQ3_COMPAT
 /*
  * function prototypes
  */
 static struct jobs_if *jobs_attach(struct ifaltq *, u_int, u_int, u_int);
-static int jobs_detach(struct jobs_if *);
+static void jobs_detach(struct jobs_if *);
 static int jobs_clear_interface(struct jobs_if *);
 static int jobs_request(struct ifaltq *, int, void *);
 static void jobs_purge(struct jobs_if *);
 static struct jobs_class *jobs_class_create(struct jobs_if *,
     int, int64_t, int64_t, int64_t, int64_t, int64_t, int);
 static int jobs_class_destroy(struct jobs_class *);
 static int jobs_enqueue(struct ifaltq *, struct mbuf *, struct altq_pktattr *);
 static struct mbuf *jobs_dequeue(struct ifaltq *, int);
 static int jobs_addq(struct jobs_class *, struct mbuf *, struct jobs_if*);
 static struct mbuf *jobs_getq(struct jobs_class *);
 static struct mbuf *jobs_pollq(struct jobs_class *);
 static void jobs_purgeq(struct jobs_class *);
 @@ -174,46 +174,45 @@ jobs_attach(struct ifaltq *ifq, u_int ba
 	jif->avg_cycles_dequeue = 0;
 	jif->avg_cycles2_dequeue = 0;
 	jif->bc_cycles_dequeue = ALTQ_INFINITY;
 	jif->total_enqueued = 0;
 	jif->total_dequeued = 0;
 	/* add this state to the jobs list */
 	jif->jif_next = jif_list;
 	jif_list = jif;
 	return (jif);
+}
-static int
+static void
 jobs_detach(struct jobs_if *jif)
+{
 	(void)jobs_clear_interface(jif);
 	/* remove this interface from the jif list */
 	if (jif_list == jif)
 		jif_list = jif->jif_next;
 	else {
 		struct jobs_if *p;
 		for (p = jif_list; p != NULL; p = p->jif_next)
 			if (p->jif_next == jif) {
 				p->jif_next = jif->jif_next;
 				break;
+			}
 		ASSERT(p != NULL);
+	}
 	free(jif, M_DEVBUF);
 	return (0);
+}
 /*
  * bring the interface back to the initial state by discarding
  * all the filters and classes.
  */
 static int
 jobs_clear_interface(struct jobs_if *jif)
+{
 	struct jobs_class	*cl;
 	int	pri;
 	/* free the filters for this interface */
 @@ -1827,38 +1826,41 @@ jobsopen(dev_t dev, int flag, int fmt,
 	if (machclk_freq == 0) {
 		printf("jobs: no CPU clock available!\n");
 		return (ENXIO);
+	}
 	/* everything will be done when the queueing scheme is attached. */
 	return 0;
+}
 int
 jobsclose(dev_t dev, int flag, int fmt,
     struct lwp *l)
+{
 	struct jobs_if *jif;
 	int err, error = 0;
 	while ((jif = jif_list) != NULL) {
 		/* destroy all */
 		if (ALTQ_IS_ENABLED(jif->jif_ifq))
 			altq_disable(jif->jif_ifq);
-		err = altq_detach(jif->jif_ifq);
+		int error = altq_detach(pif->pif_ifq);
-		if (err == 0)
+		switch (error) {
-			err = jobs_detach(jif);
+		case 0:
-		if (err != 0 && error == 0)
+		case ENXIO:	/* already disabled */
-			error = err;
+			break;
 		default:
 			return error;
+		}
 		jobs_detach(jif);
+	}
 	return error;
+}
 int
 jobsioctl(dev_t dev, ioctlcmd_t cmd, void *addr, int flag,
     struct lwp *l)
+{
 	struct jobs_if *jif;
 	struct jobs_interface *ifacep;
 	struct proc *p = l->l_proc;
 	int	error = 0;
 @@ -1961,47 +1963,48 @@ jobscmd_if_attach(struct jobs_attach *ap
 	int error;
 	if ((ifp = ifunit(ap->iface.jobs_ifname)) == NULL)
 		return (ENXIO);
 	if ((jif = jobs_attach(&ifp->if_snd, ap->bandwidth, ap->qlimit, ap->separate)) == NULL)
 		return (ENOMEM);
 	/*
 	 * set JOBS to this ifnet structure.
 	 */
 	if ((error = altq_attach(&ifp->if_snd, ALTQT_JOBS, jif,
 				 jobs_enqueue, jobs_dequeue, jobs_request,
 				 &jif->jif_classifier, acc_classify)) != 0)
-		(void)jobs_detach(jif);
+		jobs_detach(jif);
 	return (error);
+}
 static int
 jobscmd_if_detach(struct jobs_interface *ap)
+{
 	struct jobs_if *jif;
 	int error;
 	if ((jif = altq_lookup(ap->jobs_ifname, ALTQT_JOBS)) == NULL)
 		return (EBADF);
 	if (ALTQ_IS_ENABLED(jif->jif_ifq))
 		altq_disable(jif->jif_ifq);
 	if ((error = altq_detach(jif->jif_ifq)))
 		return (error);
-	return jobs_detach(jif);
+	jobs_detach(jif);
 	return 0;
+}
 static int
 jobscmd_add_class(struct jobs_add_class *ap)
+{
 	struct jobs_if *jif;
 	struct jobs_class *cl;
 	if ((jif = altq_lookup(ap->iface.jobs_ifname, ALTQT_JOBS)) == NULL)
 		return (EBADF);
 	if (ap->pri < 0 || ap->pri >= JOBS_MAXPRI)
 		return (EINVAL);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: altq_priq.c,v 1.21 2009/03/14 15:35:58 dsl Exp $	*/
+/*	$NetBSD: altq_priq.c,v 1.22 2016/01/22 18:19:54 christos Exp $	*/
 /*	$KAME: altq_priq.c,v 1.13 2005/04/13 03:44:25 suz Exp $	*/
 /*
  * Copyright (C) 2000-2003
  *	Sony Computer Science Laboratories Inc.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -21,27 +21,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * priority queue
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_priq.c,v 1.21 2009/03/14 15:35:58 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_priq.c,v 1.22 2016/01/22 18:19:54 christos Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_altq.h"
 #include "opt_inet.h"
 #include "pf.h"
 #endif
 #ifdef ALTQ_PRIQ  /* priq is enabled by ALTQ_PRIQ option in opt_altq.h */
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 @@ -58,27 +58,27 @@ __KERNEL_RCSID(0, "$NetBSD: altq_priq.c,
 #if NPF > 0
 #include <net/pfvar.h>
 #endif
 #include <altq/altq.h>
 #include <altq/altq_conf.h>
 #include <altq/altq_priq.h>
 /*
  * function prototypes
  */
 #ifdef ALTQ3_COMPAT
 static struct priq_if *priq_attach(struct ifaltq *, u_int);
-static int priq_detach(struct priq_if *);
+static void priq_detach(struct priq_if *);
 #endif
 static int priq_clear_interface(struct priq_if *);
 static int priq_request(struct ifaltq *, int, void *);
 static void priq_purge(struct priq_if *);
 static struct priq_class *priq_class_create(struct priq_if *, int, int, int,
     int);
 static int priq_class_destroy(struct priq_class *);
 static int priq_enqueue(struct ifaltq *, struct mbuf *, struct altq_pktattr *);
 static struct mbuf *priq_dequeue(struct ifaltq *, int);
 static int priq_addq(struct priq_class *, struct mbuf *);
 static struct mbuf *priq_getq(struct priq_class *);
 static struct mbuf *priq_pollq(struct priq_class *);
 @@ -638,80 +638,82 @@ priq_attach(struct ifaltq *ifq, u_int ba
 	if (pif == NULL)
 		return (NULL);
 	pif->pif_bandwidth = bandwidth;
 	pif->pif_maxpri = -1;
 	pif->pif_ifq = ifq;
 	/* add this state to the priq list */
 	pif->pif_next = pif_list;
 	pif_list = pif;
 	return (pif);
+}
-static int
+static void
 priq_detach(struct priq_if *pif)
+{
 	(void)priq_clear_interface(pif);
 	/* remove this interface from the pif list */
 	if (pif_list == pif)
 		pif_list = pif->pif_next;
 	else {
 		struct priq_if *p;
 		for (p = pif_list; p != NULL; p = p->pif_next)
 			if (p->pif_next == pif) {
 				p->pif_next = pif->pif_next;
 				break;
+			}
 		ASSERT(p != NULL);
+	}
 	free(pif, M_DEVBUF);
 	return (0);
+}
 /*
  * priq device interface
  */
 int
 priqopen(dev_t dev, int flag, int fmt,
     struct lwp *l)
+{
 	/* everything will be done when the queueing scheme is attached. */
 	return 0;
+}
 int
 priqclose(dev_t dev, int flag, int fmt,
     struct lwp *l)
+{
 	struct priq_if *pif;
 	int err, error = 0;
 	while ((pif = pif_list) != NULL) {
 		/* destroy all */
 		if (ALTQ_IS_ENABLED(pif->pif_ifq))
 			altq_disable(pif->pif_ifq);
-		err = altq_detach(pif->pif_ifq);
+		int error = altq_detach(pif->pif_ifq);
-		if (err == 0)
+		switch (error) {
-			err = priq_detach(pif);
+		case 0:
-		if (err != 0 && error == 0)
+		case ENXIO:	/* already disabled */
-			error = err;
+			break;
 		default:
 			return error;
+		}
 		priq_detach(pif);
+	}
-	return error;
+	return 0;
+}
 int
 priqioctl(dev_t dev, ioctlcmd_t cmd, void *addr, int flag,
     struct lwp *l)
+{
 	struct priq_if *pif;
 	struct priq_interface *ifacep;
 	int	error = 0;
 	/* check super-user privilege */
 	switch (cmd) {
 	case PRIQ_GETSTATS:
 @@ -811,47 +813,48 @@ priqcmd_if_attach(struct priq_interface
 	if ((ifp = ifunit(ap->ifname)) == NULL)
 		return (ENXIO);
 	if ((pif = priq_attach(&ifp->if_snd, ap->arg)) == NULL)
 		return (ENOMEM);
 	/*
 	 * set PRIQ to this ifnet structure.
 	 */
 	if ((error = altq_attach(&ifp->if_snd, ALTQT_PRIQ, pif,
 				 priq_enqueue, priq_dequeue, priq_request,
 				 &pif->pif_classifier, acc_classify)) != 0)
-		(void)priq_detach(pif);
+		priq_detach(pif);
 	return (error);
+}
 static int
 priqcmd_if_detach(struct priq_interface *ap)
+{
 	struct priq_if *pif;
 	int error;
 	if ((pif = altq_lookup(ap->ifname, ALTQT_PRIQ)) == NULL)
 		return (EBADF);
 	if (ALTQ_IS_ENABLED(pif->pif_ifq))
 		altq_disable(pif->pif_ifq);
 	if ((error = altq_detach(pif->pif_ifq)))
 		return (error);
-	return priq_detach(pif);
+	priq_detach(pif);
 	return 0;
+}
 static int
 priqcmd_add_class(struct priq_add_class *ap)
+{
 	struct priq_if *pif;
 	struct priq_class *cl;
 	int qid;
 	if ((pif = altq_lookup(ap->iface.ifname, ALTQT_PRIQ)) == NULL)
 		return (EBADF);
 	if (ap->pri < 0 || ap->pri >= PRIQ_MAXPRI)