[src/netbsd-7]: src/sys/external/bsd/ipf/netinet Pull up following revision(s...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/80888fa2a0b9
branches:  netbsd-7
changeset: 799890:80888fa2a0b9
user:      snj <snj%NetBSD.org@localhost>
date:      Fri Apr 29 19:00:40 2016 +0000

description:
Pull up following revision(s) (requested by christos in ticket #1152):
        sys/external/bsd/ipf/netinet/fil.c: revision 1.17
Comment out the mutex calls that protect against concurrent configuration
changes and processing. This needs to be done differently since you can't
sleep during interrupt processing.

diffstat:

 sys/external/bsd/ipf/netinet/fil.c |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (51 lines):

diff -r 4d3bf34ab8ce -r 80888fa2a0b9 sys/external/bsd/ipf/netinet/fil.c
--- a/sys/external/bsd/ipf/netinet/fil.c        Fri Apr 29 18:58:17 2016 +0000
+++ b/sys/external/bsd/ipf/netinet/fil.c        Fri Apr 29 19:00:40 2016 +0000
@@ -1,4 +1,4 @@
-/*     $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.
@@ -138,7 +138,7 @@
 #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 $";
@@ -2916,7 +2916,9 @@
                LBUMPD(ipf_stats[out], fr_short);
        }
 
+#if 0
        READ_ENTER(&softc->ipf_mutex);
+#endif
 
        if (!out) {
                switch (fin->fin_v)
@@ -3048,9 +3050,10 @@
                fr->fr_ref++;
                MUTEX_EXIT(&fr->fr_lock);
        }
-
+#if 0
        RWLOCK_EXIT(&softc->ipf_mutex);
 #endif
+#endif
 
        if ((pass & FR_RETMASK) != 0) {
                /*
@@ -3146,8 +3149,10 @@
 #endif
        }
 #if !defined(FASTROUTE_RECURSION)
+#if 0
        RWLOCK_EXIT(&softc->ipf_mutex);
 #endif
+#endif
 
 finished:
        if (!FR_ISPASS(pass)) {