Reduce divergence from FreeBSD sources

6 files changed, 21 insertions, 23 deletions

diff --git a/freebsd/sys/contrib/pf/net/if_pflog.c b/freebsd/sys/contrib/pf/net/if_pflog.c
index 8e33eaf3..5efbf76d 100644
--- a/freebsd/sys/contrib/pf/net/if_pflog.c
+++ b/freebsd/sys/contrib/pf/net/if_pflog.c
@@ -57,8 +57,8 @@ __FBSDID("$FreeBSD$");
 #endif
 
 #else /* ! __FreeBSD__ */
-#include <rtems/bsd/local/bpfilter.h>
-#include <rtems/bsd/local/pflog.h>
+#include "bpfilter.h"
+#include "pflog.h"
 #endif /* __FreeBSD__ */
 
 #include <rtems/bsd/sys/param.h>
diff --git a/freebsd/sys/contrib/pf/net/if_pfsync.c b/freebsd/sys/contrib/pf/net/if_pfsync.c
index f4fe498f..24c80e3d 100644
--- a/freebsd/sys/contrib/pf/net/if_pfsync.c
+++ b/freebsd/sys/contrib/pf/net/if_pfsync.c
@@ -105,7 +105,7 @@ __FBSDID("$FreeBSD$");
 #endif /* INET6 */
 
 #ifndef __FreeBSD__
-#include <rtems/bsd/local/carp.h>
+#include "carp.h"
 #endif
 #if NCARP > 0
 #include <netinet/ip_carp.h>
@@ -115,8 +115,8 @@ __FBSDID("$FreeBSD$");
 #include <net/if_pfsync.h>
 
 #ifndef __FreeBSD__
-#include <rtems/bsd/local/bpfilter.h>
-#include <rtems/bsd/local/pfsync.h>
+#include "bpfilter.h"
+#include "pfsync.h"
 #endif
 
 #define PFSYNC_MINMTU	\
diff --git a/freebsd/sys/contrib/pf/net/pf.c b/freebsd/sys/contrib/pf/net/pf.c
index e24cd26c..70123329 100644
--- a/freebsd/sys/contrib/pf/net/pf.c
+++ b/freebsd/sys/contrib/pf/net/pf.c
@@ -69,9 +69,9 @@ __FBSDID("$FreeBSD$");
 #endif
 
 #else
-#include <rtems/bsd/local/bpfilter.h>
-#include <rtems/bsd/local/pflog.h>
-#include <rtems/bsd/local/pfsync.h>
+#include "bpfilter.h"
+#include "pflog.h"
+#include "pfsync.h"
 #endif
 
 #include <rtems/bsd/sys/param.h>
diff --git a/freebsd/sys/contrib/pf/net/pf_ioctl.c b/freebsd/sys/contrib/pf/net/pf_ioctl.c
index b380701e..7479b510 100644
--- a/freebsd/sys/contrib/pf/net/pf_ioctl.c
+++ b/freebsd/sys/contrib/pf/net/pf_ioctl.c
@@ -65,9 +65,9 @@ __FBSDID("$FreeBSD$");
 #endif
 
 #else
-#include <rtems/bsd/local/bpfilter.h>
-#include <rtems/bsd/local/pflog.h>
-#include <rtems/bsd/local/pfsync.h>
+#include "bpfilter.h"
+#include "pflog.h"
+#include "pfsync.h"
 #endif
 
 #include <rtems/bsd/sys/param.h>
diff --git a/freebsd/sys/contrib/pf/net/pf_norm.c b/freebsd/sys/contrib/pf/net/pf_norm.c
index de0ff245..a59c3fd8 100644
--- a/freebsd/sys/contrib/pf/net/pf_norm.c
+++ b/freebsd/sys/contrib/pf/net/pf_norm.c
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
 #define	NPFLOG 0
 #endif
 #else
-#include <rtems/bsd/local/pflog.h>
+#include "pflog.h"
 #endif
 
 #include <rtems/bsd/sys/param.h>
diff --git a/freebsd/sys/contrib/pf/net/pf_osfp.c b/freebsd/sys/contrib/pf/net/pf_osfp.c
index 0995797a..7ff79c00 100644
--- a/freebsd/sys/contrib/pf/net/pf_osfp.c
+++ b/freebsd/sys/contrib/pf/net/pf_osfp.c
@@ -135,11 +135,6 @@ pf_osfp_fingerprint_hdr(const struct ip *ip, const struct ip6_hdr *ip6, const st
 #else
 	char srcname[NI_MAXHOST];
 #endif
-#ifdef __rtems__
-#ifdef INET6
-char ip6buf[INET6_ADDRSTRLEN];
-#endif //INET6
-#endif //__rtems__
 
 	if ((tcp->th_flags & (TH_SYN|TH_ACK)) != TH_SYN)
 		return (NULL);
@@ -176,6 +171,9 @@ char ip6buf[INET6_ADDRSTRLEN];
 #ifndef _KERNEL
 		struct sockaddr_in6 sin6;
 #endif
+#ifdef __rtems__
+		char ip6buf[INET6_ADDRSTRLEN];
+#endif /* __rtems__ */
 
 		/* jumbo payload? */
 		fp.fp_psize = sizeof(struct ip6_hdr) + ntohs(ip6->ip6_plen);
@@ -184,12 +182,12 @@ char ip6buf[INET6_ADDRSTRLEN];
 		fp.fp_flags |= PF_OSFP_INET6;
 #ifdef _KERNEL
 #ifndef __rtems__
-    strlcpy(srcname, ip6_sprintf((struct in6_addr *)&ip6->ip6_src),
+		strlcpy(srcname, ip6_sprintf((struct in6_addr *)&ip6->ip6_src),
 		    sizeof(srcname));
-#else
-    strlcpy(srcname, ip6_sprintf(&ip6buf, (struct in6_addr *)&ip6->ip6_src),
-        sizeof(srcname));
-#endif
+#else /* __rtems__ */
+		strlcpy(srcname, ip6_sprintf(ip6buf, (struct in6_addr *)&ip6->ip6_src),
+		    sizeof(srcname));
+#endif /* __rtems__ */
 #else
 		memset(&sin6, 0, sizeof(sin6));
 		sin6.sin6_family = AF_INET6;
@@ -322,7 +320,7 @@ pf_osfp_initialize(void)
 {
 #if defined(__FreeBSD__) && defined(_KERNEL)
 	int error = ENOMEM;
-
+	
 	do {
 		pf_osfp_entry_pl = pf_osfp_pl = NULL;
 		UMA_CREATE(pf_osfp_entry_pl, struct pf_osfp_entry, "pfospfen");