[src/trunk]: src/sys Add the ifnet_t::if_npf_private field. Bump the kernel ...

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

details:   https://anonhg.NetBSD.org/src/rev/aacd382e5d64
branches:  trunk
changeset: 964648:aacd382e5d64
user:      rmind <rmind%NetBSD.org@localhost>
date:      Sat Aug 10 21:13:54 2019 +0000

description:
Add the ifnet_t::if_npf_private field.  Bump the kernel version.
Fixes PR/54098.

diffstat:

 sys/net/if.h         |  3 ++-
 sys/net/npf/npf_os.c |  8 ++++----
 sys/sys/param.h      |  4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diffs (72 lines):

diff -r 39d0a160f13a -r aacd382e5d64 sys/net/if.h
--- a/sys/net/if.h      Sat Aug 10 20:35:35 2019 +0000
+++ b/sys/net/if.h      Sat Aug 10 21:13:54 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if.h,v 1.274 2019/07/04 02:44:25 ozaki-r Exp $ */
+/*     $NetBSD: if.h,v 1.275 2019/08/10 21:13:54 rmind Exp $   */
 
 /*-
  * Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -340,6 +340,7 @@
        struct mowner   *if_mowner;     /* ?: who owns mbufs for this interface */
 
        void            *if_agrprivate; /* ?: used only when #if NAGR > 0 */
+       void            *if_npf_private;/* ?: associated NPF context */
 
        /*
         * pf specific data, used only when #if NPF > 0.
diff -r 39d0a160f13a -r aacd382e5d64 sys/net/npf/npf_os.c
--- a/sys/net/npf/npf_os.c      Sat Aug 10 20:35:35 2019 +0000
+++ b/sys/net/npf/npf_os.c      Sat Aug 10 21:13:54 2019 +0000
@@ -33,7 +33,7 @@
 
 #ifdef _KERNEL
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_os.c,v 1.12 2019/07/23 00:52:01 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_os.c,v 1.13 2019/08/10 21:13:54 rmind Exp $");
 
 #ifdef _KERNEL_OPT
 #include "pf.h"
@@ -313,7 +313,7 @@
        KERNEL_LOCK(1, NULL);
        IFNET_GLOBAL_LOCK();
        IFNET_WRITER_FOREACH(ifp) {
-               ifp->if_pf_kif = arg;
+               ifp->if_npf_private = arg;
        }
        IFNET_GLOBAL_UNLOCK();
        KERNEL_UNLOCK_ONE(NULL);
@@ -322,13 +322,13 @@
 static void *
 npf_ifop_getmeta(const ifnet_t *ifp)
 {
-       return ifp->if_pf_kif;
+       return ifp->if_npf_private;
 }
 
 static void
 npf_ifop_setmeta(ifnet_t *ifp, void *arg)
 {
-       ifp->if_pf_kif = arg;
+       ifp->if_npf_private = arg;
 }
 
 #ifdef _KERNEL
diff -r 39d0a160f13a -r aacd382e5d64 sys/sys/param.h
--- a/sys/sys/param.h   Sat Aug 10 20:35:35 2019 +0000
+++ b/sys/sys/param.h   Sat Aug 10 21:13:54 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.605 2019/08/10 02:17:36 mrg Exp $  */
+/*     $NetBSD: param.h,v 1.606 2019/08/10 21:13:54 rmind Exp $        */
 
 /*-
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -67,7 +67,7 @@
  *     2.99.9          (299000900)
  */
 
-#define        __NetBSD_Version__      999000600       /* NetBSD 9.99.6 */
+#define        __NetBSD_Version__      999000700       /* NetBSD 9.99.7 */
 
 #define __NetBSD_Prereq__(M,m,p) (((((M) * 100000000) + \
     (m) * 1000000) + (p) * 100) <= __NetBSD_Version__)