* The #ifdef's to cause mutex's for freebsd to be declared were meant to pick

  up on USE_MUTEX being defined, but this patch
* Remove some code that's in a #ifndef FreeBSD that's no longer used.

2 files changed, 4 insertions, 19 deletions

diff --git a/sys/contrib/ipfilter/netinet/fil.c b/sys/contrib/ipfilter/netinet/fil.c
index 5687e8fd76a1..e545b9bf461c 100644
--- a/sys/contrib/ipfilter/netinet/fil.c
+++ b/sys/contrib/ipfilter/netinet/fil.c
@@ -115,10 +115,10 @@ extern	int	opts;
 # define	FR_VERBOSE(verb_pr)
 # define	FR_DEBUG(verb_pr)
 # define	IPLLOG(a, c, d, e)		ipflog(a, c, d, e)
-# if SOLARIS || defined(__sgi) || (__FreeBSD_version >= 500043)
+# ifdef USE_MUTEX
 extern	KRWLOCK_T	ipf_mutex, ipf_auth, ipf_nat;
 extern	kmutex_t	ipf_rw;
-# endif /* SOLARIS || __sgi || __FreeBSD_version */
+# endif /* USE_MUTEX */
 #endif /* _KERNEL */
 
 
@@ -1051,15 +1051,6 @@ int out;
 	fin->fin_out = out;
 #endif /* _KERNEL */
 	
-#ifndef __FreeBSD__
-	/*
-	 * Be careful here: ip_id is in network byte order when called
-	 * from ip_output()
-	 */
-	if ((out) && (v == 4))
-		ip->ip_id = ntohs(ip->ip_id);
-#endif
-
 	changed = 0;
 	fin->fin_v = v;
 	fin->fin_ifp = ifp;
@@ -1305,11 +1296,6 @@ logit:
 	}
 #endif /* IPFILTER_LOG */
 
-#ifndef __FreeBSD__	
-	if ((out) && (v == 4))
-		ip->ip_id = htons(ip->ip_id);
-#endif
-
 #ifdef	_KERNEL
 	/*
 	 * Only allow FR_DUP to work if a rule matched - it makes no sense to
diff --git a/sys/contrib/ipfilter/netinet/ip_fil.c b/sys/contrib/ipfilter/netinet/ip_fil.c
index b3d5ef7d8887..f9744007a99a 100644
--- a/sys/contrib/ipfilter/netinet/ip_fil.c
+++ b/sys/contrib/ipfilter/netinet/ip_fil.c
@@ -169,9 +169,8 @@ static	int	ipfr_fastroute6 __P((struct mbuf *, struct mbuf **,
 # endif
 # ifdef	__sgi
 extern	int		tcp_mtudisc;
-extern	kmutex_t        ipf_rw;
-extern	KRWLOCK_T	ipf_mutex;
-# elif (__FreeBSD_version >= 500043)
+# endif
+# ifdef USE_MUTEX
 extern	kmutex_t        ipf_rw;
 extern	KRWLOCK_T	ipf_mutex;
 # endif