Author: ae
Date: Wed Mar 20 10:11:21 2019
New Revision: 345321
URL: https://svnweb.freebsd.org/changeset/base/345321
Log:
Do not enter epoch section recursively.
A pfil hook is already invoked in NET_EPOCH section.
Modified:
head/sys/netpfil/ipfw/nat64/nat64lsn.c
Modified: head/sys/netpfil/ipfw/nat64/nat64lsn.c
==============================================================================
--- head/sys/netpfil/ipfw/nat64/nat64lsn.c Wed Mar 20 10:09:38 2019
(r345320)
+++ head/sys/netpfil/ipfw/nat64/nat64lsn.c Wed Mar 20 10:11:21 2019
(r345321)
@@ -1514,7 +1514,6 @@ int
ipfw_nat64lsn(struct ip_fw_chain *ch, struct ip_fw_args *args,
ipfw_insn *cmd, int *done)
{
- struct epoch_tracker et;
struct nat64lsn_cfg *cfg;
ipfw_insn *icmd;
int ret;
@@ -1531,7 +1530,6 @@ ipfw_nat64lsn(struct ip_fw_chain *ch, struct ip_fw_arg
*done = 1; /* terminate the search */
- NAT64LSN_EPOCH_ENTER(et);
switch (args->f_id.addr_type) {
case 4:
ret = nat64lsn_translate4(cfg, &args->f_id, &args->m);
@@ -1551,7 +1549,6 @@ ipfw_nat64lsn(struct ip_fw_chain *ch, struct ip_fw_arg
default:
ret = cfg->nomatch_verdict;
}
- NAT64LSN_EPOCH_EXIT(et);
if (ret != IP_FW_PASS && args->m != NULL) {
m_freem(args->m);
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
