Date: Thu, 25 Jun 2015 15:05:59 +0000 (UTC) From: Ermal Luçi <eri@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284814 - head/sys/net/altq Message-ID: <201506251505.t5PF5xFp028119@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: eri Date: Thu Jun 25 15:05:58 2015 New Revision: 284814 URL: https://svnweb.freebsd.org/changeset/base/284814 Log: Correct r284777 to use proper includes and remove dead code to unbreak kernel builds. Differential Revision: https://reviews.freebsd.org/D2847 Modified: head/sys/net/altq/altq_fairq.c Modified: head/sys/net/altq/altq_fairq.c ============================================================================== --- head/sys/net/altq/altq_fairq.c Thu Jun 25 14:58:50 2015 (r284813) +++ head/sys/net/altq/altq_fairq.c Thu Jun 25 15:05:58 2015 (r284814) @@ -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, #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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506251505.t5PF5xFp028119>