Page MenuHomeFreeBSD
Files F81970226

D2079.id4501.diff
No OneTemporary
Actions

D2079.id4501.diff
View Options

Index: sys/netinet/tcp_subr.c
===================================================================
--- sys/netinet/tcp_subr.c
+++ sys/netinet/tcp_subr.c
@@ -1033,32 +1033,43 @@
}
void
-tcp_timer_2msl_discard(void *xtp) {
+tcp_timer_2msl_discard(void *xtp)
+{
+
tcp_timer_discard((struct tcpcb *)xtp, TT_2MSL);
}
void
-tcp_timer_keep_discard(void *xtp) {
+tcp_timer_keep_discard(void *xtp)
+{
+
tcp_timer_discard((struct tcpcb *)xtp, TT_KEEP);
}
void
-tcp_timer_persist_discard(void *xtp) {
+tcp_timer_persist_discard(void *xtp)
+{
+
tcp_timer_discard((struct tcpcb *)xtp, TT_PERSIST);
}
void
-tcp_timer_rexmt_discard(void *xtp) {
+tcp_timer_rexmt_discard(void *xtp)
+{
+
tcp_timer_discard((struct tcpcb *)xtp, TT_REXMT);
}
void
-tcp_timer_delack_discard(void *xtp) {
+tcp_timer_delack_discard(void *xtp)
+{
+
tcp_timer_discard((struct tcpcb *)xtp, TT_DELACK);
}
void
-tcp_timer_discard(struct tcpcb *tp, uint32_t timer_type) {
+tcp_timer_discard(struct tcpcb *tp, uint32_t timer_type)
+{
CURVNET_SET(tp->t_vnet);
INP_INFO_WLOCK(&V_tcbinfo);
Index: sys/netinet/tcp_timer.c
===================================================================
--- sys/netinet/tcp_timer.c
+++ sys/netinet/tcp_timer.c
@@ -817,7 +817,7 @@
return;
#endif
- if(tp->t_timers->tt_flags & TT_STOPPED)
+ if (tp->t_timers->tt_flags & TT_STOPPED)
return;
switch (timer_type) {
@@ -893,7 +893,7 @@
tcp_timer_stop(struct tcpcb * tp, uint32_t timer_type)
{
struct callout *t_callout;
- void *f_callout;
+ timeout_t *f_callout;
tp->t_timers->tt_flags |= TT_STOPPED;
@@ -922,7 +922,7 @@
panic("bad timer_type");
}
- if(tp->t_timers->tt_flags & timer_type) {
+ if (tp->t_timers->tt_flags & timer_type) {
if (callout_stop(t_callout)) {
tp->t_timers->tt_flags &= ~timer_type;
} else {
Index: sys/netinet/tcp_var.h
===================================================================
--- sys/netinet/tcp_var.h
+++ sys/netinet/tcp_var.h
@@ -207,7 +207,7 @@
uint32_t t_ispare[8]; /* 5 UTO, 3 TBD */
void *t_pspare2[4]; /* 1 TCP_SIGNATURE, 3 TBD */
- uint64_t _pad[3]; /* 3 TBD (1-2 CC/RTT?) */
+ uint64_t _pad[6]; /* 6 TBD (1-2 CC/RTT?) */
};
/*

File Metadata

Mime Type
text/plain
Expires
Sun, Dec 15, 3:49 PM (20 h, 15 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
9091750
Default Alt Text
D2079.id4501.diff (2 KB)

Event Timeline