In some email I received from McLone the Great, sie wrote: > > I still msut modify /usr/src/sys/contrib/ipfilter/netinet/ip_compat.h > and change bpf.h to net/bpf.h on lines 762 and 778, or "make depend" > will fail. This is fresh src form 5.2.1-RELEASE cd, not cvsup'ped, and > same thinh on src tree upgraded to 5.2.1-RELEASE-p5.
This change is wrong. You should be changing "bpf.h" to "opt_bpf.h" as in the patch below. Darren Index: ip_compat.h =================================================================== RCS file: /devel/CVS/IP-Filter/ip_compat.h,v retrieving revision 2.142.2.3 diff -c -r2.142.2.3 ip_compat.h *** ip_compat.h 2004/04/16 23:28:16 2.142.2.3 --- ip_compat.h 2004/04/20 23:37:04 *************** *** 759,783 **** /* ----------------------------------------------------------------------- */ #ifdef __FreeBSD__ # if defined(_KERNEL) && !defined(IPFILTER_LKM) && !defined(KLD_MODULE) ! # include "bpf.h" # if defined(__FreeBSD_version) && (__FreeBSD_version >= 400000) # include "opt_inet6.h" # endif ! # ifdef INET6 # define USE_INET6 # endif # endif # if defined(_KERNEL) # define COPYIN(a,b,c) copyin((caddr_t)(a), (caddr_t)(b), (c)) # define COPYOUT(a,b,c) copyout((caddr_t)(a), (caddr_t)(b), (c)) # define BCOPYIN(a,b,c) bcopy((caddr_t)(a), (caddr_t)(b), (c)) # define BCOPYOUT(a,b,c) bcopy((caddr_t)(a), (caddr_t)(b), (c)) - # if !defined(IPFILTER_LKM) && (__FreeBSD_version >= 300000) - # include "bpf.h" - # include "opt_ipfilter.h" - # endif # if (__FreeBSD_version >= 500043) # define NETBSD_PF # endif --- 759,791 ---- /* ----------------------------------------------------------------------- */ #ifdef __FreeBSD__ # if defined(_KERNEL) && !defined(IPFILTER_LKM) && !defined(KLD_MODULE) ! # if (__FreeBSD_version >= 500000) ! # include "opt_bpf.h" ! # else ! # include "bpf.h" ! # endif # if defined(__FreeBSD_version) && (__FreeBSD_version >= 400000) # include "opt_inet6.h" # endif ! # if defined(INET6) && !defined(USE_INET6) # define USE_INET6 # endif # endif # if defined(_KERNEL) + # if (__FreeBSD_version >= 500000) + # include "opt_bpf.h" + # else + # include "bpf.h" + # endif + # if !defined(IPFILTER_LKM) && (__FreeBSD_version >= 300000) + # include "opt_ipfilter.h" + # endif # define COPYIN(a,b,c) copyin((caddr_t)(a), (caddr_t)(b), (c)) # define COPYOUT(a,b,c) copyout((caddr_t)(a), (caddr_t)(b), (c)) # define BCOPYIN(a,b,c) bcopy((caddr_t)(a), (caddr_t)(b), (c)) # define BCOPYOUT(a,b,c) bcopy((caddr_t)(a), (caddr_t)(b), (c)) # if (__FreeBSD_version >= 500043) # define NETBSD_PF # endif
