From: mikeb <mikeb@openbsd.org>
Date: Wed, 28 Jun 2017 18:24:02 +0000 (+0000)
Subject: hfsc.c should depend on pf instead of inet
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=f0aa51b4bc8eae105f2328d3503effe9a9d0fa5e;p=openbsd

hfsc.c should depend on pf instead of inet

Discussed with and OK henning@ at d2k17 as a part of a larger diff.
---

diff --git a/sys/conf/files b/sys/conf/files
index 64de07047c4..a335c67ef70 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-#	$OpenBSD: files,v 1.647 2017/05/29 12:58:37 jmatthew Exp $
+#	$OpenBSD: files,v 1.648 2017/06/28 18:24:02 mikeb Exp $
 #	$NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $
 
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
@@ -572,7 +572,8 @@ file	net/pf_table.c			pf
 file	net/pf_osfp.c			pf
 file	net/pf_if.c			pf
 file	net/pf_lb.c			pf
-file	net/hfsc.c			ifnet
+file	net/hfsc.c			pf
+file	net/fq_codel.c			pf
 
 pseudo-device pflog: ifnet
 file	net/if_pflog.c			pflog	needs-flag
@@ -763,7 +764,6 @@ file tmpfs/tmpfs_fifoops.c		tmpfs & fifo
 file net/art.c				art
 file net/bpf.c				bpfilter		needs-count
 file net/bpf_filter.c			bpfilter
-file net/fq_codel.c			pf
 file net/if.c
 file net/ifq.c
 file net/if_ethersubr.c			ether			needs-flag
diff --git a/sys/net/hfsc.c b/sys/net/hfsc.c
index 795e42f7f2a..195f88092b8 100644
--- a/sys/net/hfsc.c
+++ b/sys/net/hfsc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hfsc.c,v 1.40 2017/06/12 23:20:10 dlg Exp $	*/
+/*	$OpenBSD: hfsc.c,v 1.41 2017/06/28 18:24:02 mikeb Exp $	*/
 
 /*
  * Copyright (c) 2012-2013 Henning Brauer <henning@openbsd.org>
@@ -60,9 +60,6 @@
 #include <net/pfvar.h>
 #include <net/hfsc.h>
 
-/* need to provide dummies for hfsc-less kernels to reduce the if.h horror */
-#include "pf.h"
-#if NPF > 0
 /*
  * kernel internal service curve representation
  *	coordinates are given by 64 bit unsigned integers.
@@ -1597,4 +1594,3 @@ hfsc_clh2cph(struct hfsc_if *hif, u_int32_t chandle)
 			return (cl);
 	return (NULL);
 }
-#endif