Date: Thu, 15 Oct 2009 15:55:35 +0000 (UTC) From: Ermal Luçi <eri@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r198137 - user/eri/pf45/head/sys/contrib/pf/net Message-ID: <200910151555.n9FFtZqn077891@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: eri Date: Thu Oct 15 15:55:35 2009 New Revision: 198137 URL: http://svn.freebsd.org/changeset/base/198137 Log: Some more V_ foo. Modified: user/eri/pf45/head/sys/contrib/pf/net/if_pfsync.c user/eri/pf45/head/sys/contrib/pf/net/pf_ioctl.c Modified: user/eri/pf45/head/sys/contrib/pf/net/if_pfsync.c ============================================================================== --- user/eri/pf45/head/sys/contrib/pf/net/if_pfsync.c Thu Oct 15 15:30:41 2009 (r198136) +++ user/eri/pf45/head/sys/contrib/pf/net/if_pfsync.c Thu Oct 15 15:55:35 2009 (r198137) @@ -711,7 +711,11 @@ pfsync_state_import(struct pfsync_state r = pf_main_ruleset.rules[ PF_RULESET_FILTER].active.ptr_array[ntohl(sp->rule)]; else +#ifdef __FreeBSD__ + r = &V_pf_default_rule; +#else r = &pf_default_rule; +#endif if ((r->max_states && r->states_cur >= r->max_states)) goto cleanup; Modified: user/eri/pf45/head/sys/contrib/pf/net/pf_ioctl.c ============================================================================== --- user/eri/pf45/head/sys/contrib/pf/net/pf_ioctl.c Thu Oct 15 15:30:41 2009 (r198136) +++ user/eri/pf45/head/sys/contrib/pf/net/pf_ioctl.c Thu Oct 15 15:55:35 2009 (r198137) @@ -273,9 +273,9 @@ static VNET_DEFINE(struct cdevsw, pf_cde #define pf_cdevsw VNET(pf_cdevsw) static volatile VNET_DEFINE(int, pf_pfil_hooked); -#define V_pf_pfil_hooked VNET(pf_pfil_hooked) -VNET_DEFINE(int, pf_end_threads); -struct mtx pf_task_mtx; +#define V_pf_pfil_hooked VNET(pf_pfil_hooked) +VNET_DEFINE(int, pf_end_threads); +VNET_DEFINE(struct mtx, pf_task_mtx); /* pfsync */ pfsync_state_import_t *pfsync_state_import_ptr = NULL; @@ -4378,7 +4378,7 @@ pf_unload(void) V_pf_end_threads = 1; while (V_pf_end_threads < 2) { wakeup_one(pf_purge_thread); - msleep(pf_purge_thread, &pf_task_mtx, 0, "pftmo", hz); + msleep(pf_purge_thread, &V_pf_task_mtx, 0, "pftmo", hz); } pfi_cleanup(); pf_osfp_flush();
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200910151555.n9FFtZqn077891>