CVS commit: src/sys/net/npf

[Mindaugas Rasiukevicius]

Module Name:    src
Committed By:   rmind
Date:           Mon Dec 26 23:59:48 UTC 2016

Modified Files:
        src/sys/net/npf: npf_os.c

Log Message:
Convert NPF to the latest pfil(9) changes.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/net/npf/npf_os.c

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/npf/npf_os.c
diff -u src/sys/net/npf/npf_os.c:1.1 src/sys/net/npf/npf_os.c:1.2
--- src/sys/net/npf/npf_os.c:1.1	Mon Dec 26 23:05:06 2016
+++ src/sys/net/npf/npf_os.c	Mon Dec 26 23:59:47 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: npf_os.c,v 1.1 2016/12/26 23:05:06 christos Exp $	*/
+/*	$NetBSD: npf_os.c,v 1.2 2016/12/26 23:59:47 rmind Exp $	*/
 
 /*-
  * Copyright (c) 2009-2016 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 
 #ifdef _KERNEL
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_os.c,v 1.1 2016/12/26 23:05:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_os.c,v 1.2 2016/12/26 23:59:47 rmind Exp $");
 
 #ifdef _KERNEL_OPT
 #include "pf.h"
@@ -345,23 +345,20 @@ npfkern_packet_handler(void *arg, struct
 /*
  * npf_ifhook: hook handling interface changes.
  */
-static int
-npf_ifhook(void *arg, struct mbuf **mp, ifnet_t *ifp, int di)
+static void
+npf_ifhook(void *arg, unsigned long cmd, void *arg2)
 {
 	npf_t *npf = npf_getkernctx();
-	u_long cmd = (u_long)mp;
+	ifnet_t *ifp = arg2;
 
-	if (di == PFIL_IFNET) {
-		switch (cmd) {
-		case PFIL_IFNET_ATTACH:
-			npf_ifmap_attach(npf, ifp);
-			break;
-		case PFIL_IFNET_DETACH:
-			npf_ifmap_detach(npf, ifp);
-			break;
-		}
+	switch (cmd) {
+	case PFIL_IFNET_ATTACH:
+		npf_ifmap_attach(npf, ifp);
+		break;
+	case PFIL_IFNET_DETACH:
+		npf_ifmap_detach(npf, ifp);
+		break;
 	}
-	return 0;
 }
 
 /*
@@ -383,8 +380,7 @@ npf_pfil_register(bool init)
 			error = ENOENT;
 			goto out;
 		}
-		error = pfil_add_hook(npf_ifhook, NULL,
-		    PFIL_IFADDR | PFIL_IFNET, npf_ph_if);
+		error = pfil_add_ihook(npf_ifhook, NULL, PFIL_IFNET, npf_ph_if);
 		KASSERT(error == 0);
 	}
 	if (init) {
@@ -436,8 +432,7 @@ npf_pfil_unregister(bool fini)
 	KERNEL_LOCK(1, NULL);
 
 	if (fini && npf_ph_if) {
-		(void)pfil_remove_hook(npf_ifhook, NULL,
-		    PFIL_IFADDR | PFIL_IFNET, npf_ph_if);
+		(void)pfil_remove_ihook(npf_ifhook, NULL, PFIL_IFNET, npf_ph_if);
 	}
 	if (npf_ph_inet) {
 		(void)pfil_remove_hook(npfkern_packet_handler, npf,