Mark pf callouts as NET_MPSAFE.

Requested by:	yongari (serveral times)
Approved by:	re (blanket)
MFC after:	1 week

2 files changed, 5 insertions, 15 deletions

diff --git a/sys/contrib/pf/net/if_pfsync.c b/sys/contrib/pf/net/if_pfsync.c
index 315342c..2239513 100644
--- a/sys/contrib/pf/net/if_pfsync.c
+++ b/sys/contrib/pf/net/if_pfsync.c
@@ -220,15 +220,10 @@ pfsync_clone_create(struct if_clone *ifc, int unit)
 	ifp->if_baudrate = IF_Mbps(100);
 	ifp->if_softc = sc;
 	pfsync_setmtu(sc, MCLBYTES);
-	/*
-	 * XXX
-	 *  The 2nd arg. 0 to callout_init(9) shoule be set to CALLOUT_MPSAFE
-	 * if Gaint lock is removed from the network stack.
-	 */
-	callout_init(&sc->sc_tmo, 0);
-	callout_init(&sc->sc_bulk_tmo, 0);
-	callout_init(&sc->sc_bulkfail_tmo, 0);
-	callout_init(&sc->sc_send_tmo, 0);
+	callout_init(&sc->sc_tmo, NET_CALLOUT_MPSAFE);
+	callout_init(&sc->sc_bulk_tmo, NET_CALLOUT_MPSAFE);
+	callout_init(&sc->sc_bulkfail_tmo, NET_CALLOUT_MPSAFE);
+	callout_init(&sc->sc_send_tmo, NET_CALLOUT_MPSAFE);
 	mtx_init(&sc->sc_ifq.ifq_mtx, ifp->if_xname, "pfsync send queue",
 	    MTX_DEF);
 	if_attach(ifp);
diff --git a/sys/contrib/pf/net/pf_ioctl.c b/sys/contrib/pf/net/pf_ioctl.c
index 2c8989e..999243f 100644
--- a/sys/contrib/pf/net/pf_ioctl.c
+++ b/sys/contrib/pf/net/pf_ioctl.c
@@ -335,12 +335,7 @@ pfattach(void)
 	my_timeout[PFTM_SRC_NODE] = PFTM_SRC_NODE_VAL;
 	my_timeout[PFTM_TS_DIFF] = PFTM_TS_DIFF_VAL;
 
-	/*
-	 * XXX
-	 *  The 2nd arg. 0 to callout_init(9) shoule be set to CALLOUT_MPSAFE
-	 * if Gaint lock is removed from the network stack.
-	 */
-	callout_init(&pf_expire_to, 0);
+	callout_init(&pf_expire_to, NET_CALLOUT_MPSAFE);
 	callout_reset(&pf_expire_to, my_timeout[PFTM_INTERVAL] * hz,
 	    pf_purge_timeout, &pf_expire_to);