Module Name: src
Committed By: rmind
Date: Sat Aug 10 21:13:54 UTC 2019
Modified Files:
src/sys/net: if.h
src/sys/net/npf: npf_os.c
src/sys/sys: param.h
Log Message:
Add the ifnet_t::if_npf_private field. Bump the kernel version.
Fixes PR/54098.
To generate a diff of this commit:
cvs rdiff -u -r1.274 -r1.275 src/sys/net/if.h
cvs rdiff -u -r1.12 -r1.13 src/sys/net/npf/npf_os.c
cvs rdiff -u -r1.605 -r1.606 src/sys/sys/param.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if.h
diff -u src/sys/net/if.h:1.274 src/sys/net/if.h:1.275
--- src/sys/net/if.h:1.274 Thu Jul 4 02:44:25 2019
+++ src/sys/net/if.h Sat Aug 10 21:13:54 2019
@@ -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 @@ typedef struct ifnet {
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.
Index: src/sys/net/npf/npf_os.c
diff -u src/sys/net/npf/npf_os.c:1.12 src/sys/net/npf/npf_os.c:1.13
--- src/sys/net/npf/npf_os.c:1.12 Tue Jul 23 00:52:01 2019
+++ src/sys/net/npf/npf_os.c Sat Aug 10 21:13:54 2019
@@ -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 @@ npf_ifop_flush(void *arg)
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 @@ npf_ifop_flush(void *arg)
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
Index: src/sys/sys/param.h
diff -u src/sys/sys/param.h:1.605 src/sys/sys/param.h:1.606
--- src/sys/sys/param.h:1.605 Sat Aug 10 02:17:36 2019
+++ src/sys/sys/param.h Sat Aug 10 21:13:54 2019
@@ -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__)
