 @@ -1,14 +1,14 @@
-/*	$NetBSD: fil.c,v 1.15.2.1 2015/04/10 20:26:46 snj Exp $	*/
+/*	$NetBSD: fil.c,v 1.15.2.2 2016/04/29 19:00:40 snj Exp $	*/
 /*
  * Copyright (C) 2012 by Darren Reed.
+ *
  * See the IPFILTER.LICENCE file for details on licencing.
+ *
  * Id: fil.c,v 1.1.1.2 2012/07/22 13:45:07 darrenr Exp $
+ *
  */
 #if defined(KERNEL) || defined(_KERNEL)
 # undef KERNEL
 # undef _KERNEL
 # define        KERNEL	1
 @@ -128,27 +128,27 @@ struct file;
 #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104230000)
 # include <sys/callout.h>
 extern struct callout ipf_slowtimer_ch;
 #endif
 #if defined(__OpenBSD__)
 # include <sys/timeout.h>
 extern struct timeout ipf_slowtimer_ch;
 #endif
 /* END OF INCLUDES */
 #if !defined(lint)
 #if defined(__NetBSD__)
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.15.2.1 2015/04/10 20:26:46 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.15.2.2 2016/04/29 19:00:40 snj Exp $");
 #else
 static const char sccsid[] = "@(#)fil.c	1.36 6/5/96 (C) 1993-2000 Darren Reed";
 static const char rcsid[] = "@(#)Id: fil.c,v 1.1.1.2 2012/07/22 13:45:07 darrenr Exp $";
 #endif
 #endif
 #ifndef	_KERNEL
 # include "ipf.h"
 # include "ipt.h"
 extern	int	opts;
 extern	int	blockreason;
 #endif /* _KERNEL */
 @@ -2906,27 +2906,29 @@ ipf_check(void *ctx, ip_t *ip, int hlen,
 		else  if (v == 6) {
 			if (((ip6_t *)ip)->ip6_hlim < softc->ipf_minttl) {
 				LBUMPD(ipf_stats[0], fr_v6_badttl);
 				fin->fin_flx |= FI_LOWTTL;
+			}
+		}
 #endif
+	}
 	if (fin->fin_flx & FI_SHORT) {
 		LBUMPD(ipf_stats[out], fr_short);
+	}
 #if 0
 	READ_ENTER(&softc->ipf_mutex);
 #endif
 	if (!out) {
 		switch (fin->fin_v)
+		{
 		case 4 :
 			if (ipf_nat_checkin(fin, &pass) == -1) {
 				goto filterdone;
+			}
 			break;
 #ifdef USE_INET6
 		case 6 :
 			if (ipf_nat6_checkin(fin, &pass) == -1) {
 				goto filterdone;
 @@ -3038,29 +3040,30 @@ filterdone:
 #if defined(FASTROUTE_RECURSION)
 	/*
 	 * Up the reference on fr_lock and exit ipf_mutex. The generation of
 	 * a packet below can sometimes cause a recursive call into IPFilter.
 	 * On those platforms where that does happen, we need to hang onto
 	 * the filter rule just in case someone decides to remove or flush it
 	 * in the meantime.
 	 */
 	if (fr != NULL) {
 		MUTEX_ENTER(&fr->fr_lock);
 		fr->fr_ref++;
 		MUTEX_EXIT(&fr->fr_lock);
+	}
 #if 0
 	RWLOCK_EXIT(&softc->ipf_mutex);
 #endif
 #endif
 	if ((pass & FR_RETMASK) != 0) {
 		/*
 		 * Should we return an ICMP packet to indicate error
 		 * status passing through the packet filter ?
 		 * WARNING: ICMP error packets AND TCP RST packets should
 		 * ONLY be sent in repsonse to incoming packets.  Sending
 		 * them in response to outbound packets can result in a
 		 * panic on some operating systems.
 		 */
 		if (!out) {
 			if (pass & FR_RETICMP) {
 				int dst;
 @@ -3136,28 +3139,30 @@ filterdone:
 			m = *mp = NULL;
 		} else if ((fdp != NULL) && (fdp->fd_ptr != NULL) &&
 			   (fdp->fd_ptr != (struct ifnet *)-1)) {
 			/* this is for to rules: */
 			ipf_fastroute(fin->fin_m, mp, fin, fdp);
 			m = *mp = NULL;
+		}
 #if defined(FASTROUTE_RECURSION)
 		(void) ipf_derefrule(softc, &fr);
 #endif
+	}
 #if !defined(FASTROUTE_RECURSION)
 #if 0
 	RWLOCK_EXIT(&softc->ipf_mutex);
 #endif
 #endif
 finished:
 	if (!FR_ISPASS(pass)) {
 		LBUMP(ipf_stats[out].fr_block);
 		if (*mp != NULL) {
 #ifdef _KERNEL
 			FREE_MB_T(*mp);
 #endif
 			m = *mp = NULL;
+		}
 	} else {
 		LBUMP(ipf_stats[out].fr_pass);
 #if defined(_KERNEL) && defined(__sgi)