aboutsummaryrefslogtreecommitdiff
path: root/sys/net/altq/altq_fairq.c
diff options
context:
space:
mode:
authorErmal Luçi <eri@FreeBSD.org>2015-06-25 15:05:58 +0000
committerErmal Luçi <eri@FreeBSD.org>2015-06-25 15:05:58 +0000
commitcd2bc2ef4e51e67941f485c9e04dfbd703d1f6ef (patch)
treea912b8470811b118ab0ef3f3275442c3a2103010 /sys/net/altq/altq_fairq.c
parent27d233f7cc41cd461ce75c12c9b41b9e323449b8 (diff)
downloadsrc-cd2bc2ef4e51e67941f485c9e04dfbd703d1f6ef.tar.gz
src-cd2bc2ef4e51e67941f485c9e04dfbd703d1f6ef.zip
Correct r284777 to use proper includes and remove dead code to unbreak kernel builds.
Differential Revision: https://reviews.freebsd.org/D2847
Notes
Notes: svn path=/head/; revision=284814
Diffstat (limited to 'sys/net/altq/altq_fairq.c')
-rw-r--r--sys/net/altq/altq_fairq.c23
1 files changed, 4 insertions, 19 deletions
diff --git a/sys/net/altq/altq_fairq.c b/sys/net/altq/altq_fairq.c
index b513a671fe12..de00685841ab 100644
--- a/sys/net/altq/altq_fairq.c
+++ b/sys/net/altq/altq_fairq.c
@@ -103,9 +103,12 @@
#include <sys/queue.h>
#include <net/if.h>
+#include <net/if_var.h>
#include <netinet/in.h>
-#include <net/pfvar.h>
+#include <netpfil/pf/pf.h>
+#include <netpfil/pf/pf_altq.h>
+#include <netpfil/pf/pf_mtag.h>
#include <net/altq/altq.h>
#include <net/altq/altq_fairq.h>
@@ -406,24 +409,6 @@ fairq_class_create(struct fairq_if *pif, int pri, int qlimit,
#endif /* ALTQ_RED */
return (cl);
-
-err_buckets:
- if (cl->cl_buckets != NULL)
- free(cl->cl_buckets, M_DEVBUF);
-err_ret:
- if (cl->cl_red != NULL) {
-#ifdef ALTQ_RIO
- if (cl->cl_qtype == Q_RIO)
- rio_destroy((rio_t *)cl->cl_red);
-#endif
-#ifdef ALTQ_RED
- if (cl->cl_qtype == Q_RED)
- red_destroy(cl->cl_red);
-#endif
- }
- if (cl != NULL)
- free(cl, M_DEVBUF);
- return (NULL);
}
static int