d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mark pf callouts as NET_MPSAFE.

Browse Source 
Requested by:	yongari (serveral times)
Approved by:	re (blanket)
MFC after:	1 week
This commit is contained in:
mlaier 2005-06-12 16:46:20 +00:00
parent f82a1d5a8e
commit e15084485c
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/contrib/pf/net/if_pfsync.c
View File

@ -220,15 +220,10 @@ pfsync_clone_create(struct if_clone *ifc, int unit)
ifp->if_baudrate = IF_Mbps(100); ifp->if_baudrate = IF_Mbps(100);
ifp->if_softc = sc; ifp->if_softc = sc;
pfsync_setmtu(sc, MCLBYTES); pfsync_setmtu(sc, MCLBYTES);
/* callout_init(&sc->sc_tmo, NET_CALLOUT_MPSAFE);
* XXX callout_init(&sc->sc_bulk_tmo, NET_CALLOUT_MPSAFE);
* The 2nd arg. 0 to callout_init(9) shoule be set to CALLOUT_MPSAFE callout_init(&sc->sc_bulkfail_tmo, NET_CALLOUT_MPSAFE);
* if Gaint lock is removed from the network stack. callout_init(&sc->sc_send_tmo, NET_CALLOUT_MPSAFE);
*/
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);
mtx_init(&sc->sc_ifq.ifq_mtx, ifp->if_xname, "pfsync send queue", mtx_init(&sc->sc_ifq.ifq_mtx, ifp->if_xname, "pfsync send queue",
MTX_DEF); MTX_DEF);
if_attach(ifp); if_attach(ifp);

7
sys/contrib/pf/net/pf_ioctl.c
View File

@ -335,12 +335,7 @@ pfattach(void)
my_timeout[PFTM_SRC_NODE] = PFTM_SRC_NODE_VAL; my_timeout[PFTM_SRC_NODE] = PFTM_SRC_NODE_VAL;
my_timeout[PFTM_TS_DIFF] = PFTM_TS_DIFF_VAL; my_timeout[PFTM_TS_DIFF] = PFTM_TS_DIFF_VAL;
/* callout_init(&pf_expire_to, NET_CALLOUT_MPSAFE);
* 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_reset(&pf_expire_to, my_timeout[PFTM_INTERVAL] * hz, callout_reset(&pf_expire_to, my_timeout[PFTM_INTERVAL] * hz,
pf_purge_timeout, &pf_expire_to); pf_purge_timeout, &pf_expire_to);