diff options
| author | Luiz Otavio O Souza <luiz@netgate.com> | 2015-11-11 14:02:53 -0600 |
|---|---|---|
| committer | Luiz Otavio O Souza <luiz@netgate.com> | 2015-11-11 14:02:53 -0600 |
| commit | 69cf34d51f20b467d13ccf4f94f79c4e479b26bc (patch) | |
| tree | 390d1a3d82a76c4fc6f7fb0108fb72b52b485bd0 /sys/contrib | |
| parent | c548a571ceaeae698d02b862b4170d015a265ba7 (diff) | |
| download | FreeBSD-src-69cf34d51f20b467d13ccf4f94f79c4e479b26bc.zip FreeBSD-src-69cf34d51f20b467d13ccf4f94f79c4e479b26bc.tar.gz | |
MFC r284814:
Correct r284777 to use proper includes and remove dead code to unbreak kernel builds.
Differential Revision: https://reviews.freebsd.org/D2847
TAG: FAIRQ
Diffstat (limited to 'sys/contrib')
| -rw-r--r-- | sys/contrib/altq/altq/altq_fairq.c | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/sys/contrib/altq/altq/altq_fairq.c b/sys/contrib/altq/altq/altq_fairq.c index 038e6e1..ea812d8 100644 --- a/sys/contrib/altq/altq/altq_fairq.c +++ b/sys/contrib/altq/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 <altq/altq.h> #include <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 |
