diff options
author | Craig Rodrigues <rodrigc@FreeBSD.org> | 2015-01-08 17:49:07 +0000 |
---|---|---|
committer | Craig Rodrigues <rodrigc@FreeBSD.org> | 2015-01-08 17:49:07 +0000 |
commit | 7259906eb0d1c5e9faacf136b9a7b1caa7eb122b (patch) | |
tree | e1ac0455750df1c625a2e609cbfc49ff0e4195c4 /sys/netpfil/pf | |
parent | 6d2950a89828b6e9f292cf103661b5b77bae85e5 (diff) | |
download | src-7259906eb0d1c5e9faacf136b9a7b1caa7eb122b.tar.gz src-7259906eb0d1c5e9faacf136b9a7b1caa7eb122b.zip |
Do not initialize pfi_unlnkdkifs_mtx and pf_frag_mtx.
They are already initialized by MTX_SYSINIT.
Submitted by: Nikos Vassiliadis <nvass@gmx.com>
Notes
Notes:
svn path=/head/; revision=276841
Diffstat (limited to 'sys/netpfil/pf')
-rw-r--r-- | sys/netpfil/pf/pf_if.c | 4 | ||||
-rw-r--r-- | sys/netpfil/pf/pf_norm.c | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/sys/netpfil/pf/pf_if.c b/sys/netpfil/pf/pf_if.c index b0b24c572610..da79ed6f2762 100644 --- a/sys/netpfil/pf/pf_if.c +++ b/sys/netpfil/pf/pf_if.c @@ -117,10 +117,6 @@ pfi_vnet_initialize(void) V_pfi_buffer_max = 64; V_pfi_buffer = malloc(V_pfi_buffer_max * sizeof(*V_pfi_buffer), PFI_MTYPE, M_WAITOK); - - if (IS_DEFAULT_VNET(curvnet)) - mtx_init(&pfi_unlnkdkifs_mtx, "pf unlinked interfaces", NULL, MTX_DEF); - kif = malloc(sizeof(*kif), PFI_MTYPE, M_WAITOK); PF_RULES_WLOCK(); V_pfi_all = pfi_kif_attach(kif, IFG_ALL); diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c index b03a0a44c06e..fa9acd66b281 100644 --- a/sys/netpfil/pf/pf_norm.c +++ b/sys/netpfil/pf/pf_norm.c @@ -163,10 +163,6 @@ pf_vnet_normalize_init(void) V_pf_limits[PF_LIMIT_FRAGS].limit = PFFRAG_FRENT_HIWAT; uma_zone_set_max(V_pf_frent_z, PFFRAG_FRENT_HIWAT); uma_zone_set_warning(V_pf_frent_z, "PF frag entries limit reached"); - - if (IS_DEFAULT_VNET(curvnet)) - mtx_init(&pf_frag_mtx, "pf fragments", NULL, MTX_DEF); - TAILQ_INIT(&V_pf_fragqueue); TAILQ_INIT(&V_pf_cachequeue); } |