From 909b37a41475eaa2cb8ce54ab9dbbd88809b3c8d Mon Sep 17 00:00:00 2001 From: Joerg Wunsch Date: Sun, 30 Dec 2001 19:02:27 +0000 Subject: Merge last-minute fix from the i4b file made by gj: Protect mtx_init() invocations with mtx_intialized() checks to avoid a reported panic. MFC after: 1 month --- sys/net/if_spppsubr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'sys/net') diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c index 3bf22997509c5..d54cfb8259396 100644 --- a/sys/net/if_spppsubr.c +++ b/sys/net/if_spppsubr.c @@ -1006,8 +1006,10 @@ sppp_attach(struct ifnet *ifp) sp->pp_phase = PHASE_DEAD; sp->pp_up = lcp.Up; sp->pp_down = lcp.Down; - mtx_init(&sp->pp_cpq.ifq_mtx, "sppp_cpq", MTX_DEF); - mtx_init(&sp->pp_fastq.ifq_mtx, "sppp_fastq", MTX_DEF); + if(!mtx_initialized(&sp->pp_cpq.ifq_mtx)) + mtx_init(&sp->pp_cpq.ifq_mtx, "sppp_cpq", MTX_DEF); + if(!mtx_initialized(&sp->pp_fastq.ifq_mtx)) + mtx_init(&sp->pp_fastq.ifq_mtx, "sppp_fastq", MTX_DEF); sp->pp_last_recv = sp->pp_last_sent = time_second; sp->enable_vj = 1; sp->pp_comp = malloc(sizeof(struct slcompress), M_TEMP, M_WAIT); -- cgit v1.3