Date: Mon, 28 Sep 2020 12:14:38 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r366223 - releng/12.2/sys/netgraph Message-ID: <202009281214.08SCEcRr070071@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markj Date: Mon Sep 28 12:14:38 2020 New Revision: 366223 URL: https://svnweb.freebsd.org/changeset/base/366223 Log: MFS r366220: MFC r366167: ng_l2tp: Fix callout synchronization in the rexmit timeout handler PR: 241133 Approved by: re (gjb) Modified: releng/12.2/sys/netgraph/ng_l2tp.c Directory Properties: releng/12.2/ (props changed) Modified: releng/12.2/sys/netgraph/ng_l2tp.c ============================================================================== --- releng/12.2/sys/netgraph/ng_l2tp.c Mon Sep 28 11:52:09 2020 (r366222) +++ releng/12.2/sys/netgraph/ng_l2tp.c Mon Sep 28 12:14:38 2020 (r366223) @@ -1454,15 +1454,17 @@ ng_l2tp_seq_rack_timeout(node_p node, hook_p hook, voi struct mbuf *m; u_int delay; - /* Make sure callout is still active before doing anything */ - if (callout_pending(&seq->rack_timer) || - (!callout_active(&seq->rack_timer))) - return; - /* Sanity check */ L2TP_SEQ_CHECK(seq); mtx_lock(&seq->mtx); + /* Make sure callout is still active before doing anything */ + if (callout_pending(&seq->rack_timer) || + !callout_active(&seq->rack_timer)) { + mtx_unlock(&seq->mtx); + return; + } + priv->stats.xmitRetransmits++; /* Have we reached the retransmit limit? If so, notify owner. */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009281214.08SCEcRr070071>