summaryrefslogtreecommitdiff
path: root/sys/netinet/tcp_timer.c
diff options
context:
space:
mode:
authorGleb Smirnoff <glebius@FreeBSD.org>2019-11-07 00:27:23 +0000
committerGleb Smirnoff <glebius@FreeBSD.org>2019-11-07 00:27:23 +0000
commit58d94bd0d949b1cc4e288e977999a2c5cbac577e (patch)
treebd5a25188f94daa868d073286511aab598d49d8f /sys/netinet/tcp_timer.c
parent97a95ee134181433178c04251b3be05efc76d320 (diff)
Notes
Diffstat (limited to 'sys/netinet/tcp_timer.c')
-rw-r--r--sys/netinet/tcp_timer.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c
index cc9aafee6e04..28659270ce5e 100644
--- a/sys/netinet/tcp_timer.c
+++ b/sys/netinet/tcp_timer.c
@@ -339,9 +339,9 @@ tcp_timer_2msl(void *xtp)
tcp_inpinfo_lock_del(inp, tp);
goto out;
}
- INP_INFO_RLOCK_ET(&V_tcbinfo, et);
+ NET_EPOCH_ENTER(et);
tp = tcp_close(tp);
- INP_INFO_RUNLOCK_ET(&V_tcbinfo, et);
+ NET_EPOCH_EXIT(et);
tcp_inpinfo_lock_del(inp, tp);
goto out;
} else {
@@ -353,9 +353,9 @@ tcp_timer_2msl(void *xtp)
tcp_inpinfo_lock_del(inp, tp);
goto out;
}
- INP_INFO_RLOCK_ET(&V_tcbinfo, et);
+ NET_EPOCH_ENTER(et);
tp = tcp_close(tp);
- INP_INFO_RUNLOCK_ET(&V_tcbinfo, et);
+ NET_EPOCH_EXIT(et);
tcp_inpinfo_lock_del(inp, tp);
goto out;
}
@@ -478,7 +478,7 @@ dropit:
tcp_inpinfo_lock_del(inp, tp);
goto out;
}
- INP_INFO_RLOCK_ET(&V_tcbinfo, et);
+ NET_EPOCH_ENTER(et);
tp = tcp_drop(tp, ETIMEDOUT);
#ifdef TCPDEBUG
@@ -487,7 +487,7 @@ dropit:
PRU_SLOWTIMO);
#endif
TCP_PROBE2(debug__user, tp, PRU_SLOWTIMO);
- INP_INFO_RUNLOCK_ET(&V_tcbinfo, et);
+ NET_EPOCH_EXIT(et);
tcp_inpinfo_lock_del(inp, tp);
out:
CURVNET_RESTORE();
@@ -542,9 +542,9 @@ tcp_timer_persist(void *xtp)
tcp_inpinfo_lock_del(inp, tp);
goto out;
}
- INP_INFO_RLOCK_ET(&V_tcbinfo, et);
+ NET_EPOCH_ENTER(et);
tp = tcp_drop(tp, ETIMEDOUT);
- INP_INFO_RUNLOCK_ET(&V_tcbinfo, et);
+ NET_EPOCH_EXIT(et);
tcp_inpinfo_lock_del(inp, tp);
goto out;
}
@@ -559,9 +559,9 @@ tcp_timer_persist(void *xtp)
tcp_inpinfo_lock_del(inp, tp);
goto out;
}
- INP_INFO_RLOCK_ET(&V_tcbinfo, et);
+ NET_EPOCH_ENTER(et);
tp = tcp_drop(tp, ETIMEDOUT);
- INP_INFO_RUNLOCK_ET(&V_tcbinfo, et);
+ NET_EPOCH_EXIT(et);
tcp_inpinfo_lock_del(inp, tp);
goto out;
}
@@ -628,9 +628,9 @@ tcp_timer_rexmt(void * xtp)
tcp_inpinfo_lock_del(inp, tp);
goto out;
}
- INP_INFO_RLOCK_ET(&V_tcbinfo, et);
+ NET_EPOCH_ENTER(et);
tp = tcp_drop(tp, ETIMEDOUT);
- INP_INFO_RUNLOCK_ET(&V_tcbinfo, et);
+ NET_EPOCH_EXIT(et);
tcp_inpinfo_lock_del(inp, tp);
goto out;
}