From owner-svn-src-head@freebsd.org  Thu Jun 25 15:05:59 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6747A98DF6A;
 Thu, 25 Jun 2015 15:05:59 +0000 (UTC) (envelope-from eri@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 580DA16AC;
 Thu, 25 Jun 2015 15:05:59 +0000 (UTC) (envelope-from eri@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PF5xwd028120;
 Thu, 25 Jun 2015 15:05:59 GMT (envelope-from eri@FreeBSD.org)
Received: (from eri@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PF5xFp028119;
 Thu, 25 Jun 2015 15:05:59 GMT (envelope-from eri@FreeBSD.org)
Message-Id: <201506251505.t5PF5xFp028119@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: eri set sender to eri@FreeBSD.org
 using -f
From: Ermal Luçi <eri@FreeBSD.org>
Date: Thu, 25 Jun 2015 15:05:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r284814 - head/sys/net/altq
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Jun 2015 15:05:59 -0000

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