[src/netbsd-7]: src/sys/net/npf Pull up following revision(s) (requested by r...

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

details:   https://anonhg.NetBSD.org/src/rev/3a6710b9a442
branches:  netbsd-7
changeset: 800100:3a6710b9a442
user:      snj <snj%NetBSD.org@localhost>
date:      Tue Dec 27 07:03:52 2016 +0000

description:
Pull up following revision(s) (requested by rmind in ticket #1340):
        sys/net/npf/lpm.c: revision 1.3
Fix kmem_free() in hashmap_remove().

diffstat:

 sys/net/npf/lpm.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r 2521792d2cfe -r 3a6710b9a442 sys/net/npf/lpm.c
--- a/sys/net/npf/lpm.c Mon Dec 26 19:01:18 2016 +0000
+++ b/sys/net/npf/lpm.c Tue Dec 27 07:03:52 2016 +0000
@@ -31,7 +31,7 @@
 
 #if defined(_KERNEL)
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpm.c,v 1.1.2.3 2016/12/26 18:55:08 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpm.c,v 1.1.2.4 2016/12/27 07:03:52 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -245,7 +245,7 @@
                        } else {
                                hmap->bucket[i] = entry->next;
                        }
-                       free(entry, M_TEMP);
+                       kmem_free(entry, offsetof(lpm_ent_t, key[len]));
                        return 0;
                }
                prev = entry;