Page MenuHomeFreeBSD
Files F108967302

D33366.id99948.diff
No OneTemporary
Actions

D33366.id99948.diff
View Options

Index: sys/dev/cxgbe/tom/t4_cpl_io.c
===================================================================
--- sys/dev/cxgbe/tom/t4_cpl_io.c
+++ sys/dev/cxgbe/tom/t4_cpl_io.c
@@ -2299,7 +2299,7 @@
tp = intotcpcb(inp);
if (moretocome)
tp->t_flags |= TF_MORETOCOME;
- error = tp->t_fb->tfb_tcp_output(tp);
+ error = tcp_output(tp);
if (moretocome)
tp->t_flags &= ~TF_MORETOCOME;
}
Index: sys/netinet/tcp_hpts.c
===================================================================
--- sys/netinet/tcp_hpts.c
+++ sys/netinet/tcp_hpts.c
@@ -1549,7 +1549,7 @@
}
}
inp->inp_hpts_calls = 1;
- error = tp->t_fb->tfb_tcp_output(tp);
+ error = tcp_output(tp);
inp->inp_hpts_calls = 0;
if (ninp && ninp->inp_ppcb) {
/*
Index: sys/netinet/tcp_input.c
===================================================================
--- sys/netinet/tcp_input.c
+++ sys/netinet/tcp_input.c
@@ -1911,7 +1911,7 @@
tp->t_rxtcur);
sowwakeup(so);
if (sbavail(&so->so_snd))
- (void) tp->t_fb->tfb_tcp_output(tp);
+ (void) tcp_output(tp);
goto check_delack;
}
} else if (th->th_ack == tp->snd_una &&
@@ -1980,7 +1980,7 @@
tp->t_flags |= TF_DELACK;
} else {
tp->t_flags |= TF_ACKNOW;
- tp->t_fb->tfb_tcp_output(tp);
+ tcp_output(tp);
}
goto check_delack;
}
@@ -2651,7 +2651,7 @@
}
} else
tp->snd_cwnd += maxseg;
- (void) tp->t_fb->tfb_tcp_output(tp);
+ (void) tcp_output(tp);
goto drop;
} else if (tp->t_dupacks == tcprexmtthresh ||
(tp->t_flags & TF_SACK_PERMIT &&
@@ -2720,14 +2720,14 @@
tcps_sack_recovery_episode);
tp->snd_recover = tp->snd_nxt;
tp->snd_cwnd = maxseg;
- (void) tp->t_fb->tfb_tcp_output(tp);
+ (void) tcp_output(tp);
if (SEQ_GT(th->th_ack, tp->snd_una))
goto resume_partialack;
goto drop;
}
tp->snd_nxt = th->th_ack;
tp->snd_cwnd = maxseg;
- (void) tp->t_fb->tfb_tcp_output(tp);
+ (void) tcp_output(tp);
KASSERT(tp->snd_limited <= 2,
("%s: tp->snd_limited too big",
__func__));
@@ -2775,7 +2775,7 @@
(tp->snd_nxt - tp->snd_una);
SOCKBUF_UNLOCK(&so->so_snd);
if (avail > 0)
- (void) tp->t_fb->tfb_tcp_output(tp);
+ (void) tcp_output(tp);
sent = tp->snd_max - oldsndmax;
if (sent > maxseg) {
KASSERT((tp->t_dupacks == 2 &&
@@ -3327,7 +3327,7 @@
* Return any desired output.
*/
if (needoutput || (tp->t_flags & TF_ACKNOW))
- (void) tp->t_fb->tfb_tcp_output(tp);
+ (void) tcp_output(tp);
check_delack:
INP_WLOCK_ASSERT(tp->t_inpcb);
@@ -3368,7 +3368,7 @@
#endif
TCP_PROBE3(debug__input, tp, th, m);
tp->t_flags |= TF_ACKNOW;
- (void) tp->t_fb->tfb_tcp_output(tp);
+ (void) tcp_output(tp);
INP_WUNLOCK(tp->t_inpcb);
m_freem(m);
return;
@@ -4071,7 +4071,7 @@
*/
tp->snd_cwnd = maxseg + BYTES_THIS_ACK(tp, th);
tp->t_flags |= TF_ACKNOW;
- (void) tp->t_fb->tfb_tcp_output(tp);
+ (void) tcp_output(tp);
tp->snd_cwnd = ocwnd;
if (SEQ_GT(onxt, tp->snd_nxt))
tp->snd_nxt = onxt;
Index: sys/netinet/tcp_sack.c
===================================================================
--- sys/netinet/tcp_sack.c
+++ sys/netinet/tcp_sack.c
@@ -902,7 +902,7 @@
highdata - maxseg), highdata, NULL);
}
}
- (void) tp->t_fb->tfb_tcp_output(tp);
+ (void) tcp_output(tp);
}
#if 0
Index: sys/netinet/tcp_stacks/bbr.c
===================================================================
--- sys/netinet/tcp_stacks/bbr.c
+++ sys/netinet/tcp_stacks/bbr.c
@@ -11637,7 +11637,7 @@
if (bbr->r_wanted_output != 0) {
bbr->rc_output_starts_timer = 0;
did_out = 1;
- (void)tp->t_fb->tfb_tcp_output(tp);
+ (void)tcp_output(tp);
} else
bbr_start_hpts_timer(bbr, tp, cts, 6, 0, 0);
}
@@ -11676,7 +11676,7 @@
/* We are late */
bbr->r_ctl.rc_last_delay_val = 0;
BBR_STAT_INC(bbr_force_output);
- (void)tp->t_fb->tfb_tcp_output(tp);
+ (void)tcp_output(tp);
}
}
}
Index: sys/netinet/tcp_stacks/rack.c
===================================================================
--- sys/netinet/tcp_stacks/rack.c
+++ sys/netinet/tcp_stacks/rack.c
@@ -14171,7 +14171,7 @@
ctf_calc_rwin(so, tp);
if ((rack->r_wanted_output != 0) || (rack->r_fast_output != 0)) {
send_out_a_rst:
- (void)tp->t_fb->tfb_tcp_output(tp);
+ (void)tcp_output(tp);
did_out = 1;
}
rack_free_trim(rack);
@@ -14657,7 +14657,7 @@
if ((rack->r_wanted_output != 0) || (rack->r_fast_output != 0)) {
do_output_now:
did_out = 1;
- (void)tp->t_fb->tfb_tcp_output(tp);
+ (void)tcp_output(tp);
}
rack_start_hpts_timer(rack, tp, cts, 0, 0, 0);
rack_free_trim(rack);
Index: sys/netinet/tcp_stacks/rack_bbr_common.c
===================================================================
--- sys/netinet/tcp_stacks/rack_bbr_common.c
+++ sys/netinet/tcp_stacks/rack_bbr_common.c
@@ -381,7 +381,7 @@
* 1) It returns 0 if all went well and you (the caller) need
* to release the lock.
* 2) If nxt_pkt is set, then the function will surpress calls
- * to tfb_tcp_output() since you are promising to call again
+ * to tcp_output() since you are promising to call again
* with another packet.
* 3) If it returns 1, then you must free all the packets being
* shipped in, the tcb has been destroyed (or about to be destroyed).
Index: sys/netinet/tcp_subr.c
===================================================================
--- sys/netinet/tcp_subr.c
+++ sys/netinet/tcp_subr.c
@@ -2391,7 +2391,7 @@
if (TCPS_HAVERCVDSYN(tp->t_state)) {
tcp_state_change(tp, TCPS_CLOSED);
- (void) tp->t_fb->tfb_tcp_output(tp);
+ (void) tcp_output(tp);
TCPSTAT_INC(tcps_drops);
} else
TCPSTAT_INC(tcps_conndrops);
@@ -3510,7 +3510,7 @@
*/
tp->t_fb->tfb_tcp_mtu_chg(tp);
}
- tp->t_fb->tfb_tcp_output(tp);
+ tcp_output(tp);
}
#ifdef INET
Index: sys/netinet/tcp_timer.c
===================================================================
--- sys/netinet/tcp_timer.c
+++ sys/netinet/tcp_timer.c
@@ -292,7 +292,7 @@
tp->t_flags |= TF_ACKNOW;
TCPSTAT_INC(tcps_delack);
NET_EPOCH_ENTER(et);
- (void) tp->t_fb->tfb_tcp_output(tp);
+ (void) tcp_output(tp);
INP_WUNLOCK(inp);
NET_EPOCH_EXIT(et);
CURVNET_RESTORE();
@@ -563,7 +563,7 @@
tcp_setpersist(tp);
tp->t_flags |= TF_FORCEDATA;
NET_EPOCH_ENTER(et);
- (void) tp->t_fb->tfb_tcp_output(tp);
+ (void) tcp_output(tp);
NET_EPOCH_EXIT(et);
tp->t_flags &= ~TF_FORCEDATA;
@@ -843,7 +843,7 @@
cc_cong_signal(tp, NULL, CC_RTO);
NET_EPOCH_ENTER(et);
- (void) tp->t_fb->tfb_tcp_output(tp);
+ (void) tcp_output(tp);
NET_EPOCH_EXIT(et);
#ifdef TCPDEBUG
if (tp != NULL && (tp->t_inpcb->inp_socket->so_options & SO_DEBUG))
Index: sys/netinet/tcp_usrreq.c
===================================================================
--- sys/netinet/tcp_usrreq.c
+++ sys/netinet/tcp_usrreq.c
@@ -593,7 +593,7 @@
goto out_in_epoch;
#endif
tcp_timer_activate(tp, TT_KEEP, TP_KEEPINIT(tp));
- error = tp->t_fb->tfb_tcp_output(tp);
+ error = tcp_output(tp);
out_in_epoch:
NET_EPOCH_EXIT(et);
out:
@@ -690,7 +690,7 @@
(error = tcp_offload_connect(so, nam)) == 0)
goto out_in_epoch;
#endif
- error = tp->t_fb->tfb_tcp_output(tp);
+ error = tcp_output(tp);
goto out_in_epoch;
} else {
if ((inp->inp_vflag & INP_IPV6) == 0) {
@@ -714,7 +714,7 @@
#endif
tcp_timer_activate(tp, TT_KEEP, TP_KEEPINIT(tp));
NET_EPOCH_ENTER(et);
- error = tp->t_fb->tfb_tcp_output(tp);
+ error = tcp_output(tp);
#ifdef INET
out_in_epoch:
#endif
@@ -905,7 +905,7 @@
socantsendmore(so);
tcp_usrclosed(tp);
if (!(inp->inp_flags & INP_DROPPED))
- error = tp->t_fb->tfb_tcp_output(tp);
+ error = tcp_output(tp);
out:
TCPDEBUG2(PRU_SHUTDOWN);
@@ -953,7 +953,7 @@
tcp_offload_rcvd(tp);
else
#endif
- tp->t_fb->tfb_tcp_output(tp);
+ tcp_output(tp);
NET_EPOCH_EXIT(et);
out:
TCPDEBUG2(PRU_RCVD);
@@ -1188,7 +1188,7 @@
!(flags & PRUS_NOTREADY)) {
if (flags & PRUS_MORETOCOME)
tp->t_flags |= TF_MORETOCOME;
- error = tp->t_fb->tfb_tcp_output(tp);
+ error = tcp_output(tp);
if (flags & PRUS_MORETOCOME)
tp->t_flags &= ~TF_MORETOCOME;
}
@@ -1255,7 +1255,7 @@
tp->snd_up = tp->snd_una + sbavail(&so->so_snd);
if ((flags & PRUS_NOTREADY) == 0) {
tp->t_flags |= TF_FORCEDATA;
- error = tp->t_fb->tfb_tcp_output(tp);
+ error = tcp_output(tp);
tp->t_flags &= ~TF_FORCEDATA;
}
}
@@ -1312,7 +1312,7 @@
SOCKBUF_UNLOCK(&so->so_snd);
if (error == 0) {
NET_EPOCH_ENTER(et);
- error = tp->t_fb->tfb_tcp_output(tp);
+ error = tcp_output(tp);
NET_EPOCH_EXIT(et);
}
INP_WUNLOCK(inp);
@@ -2238,7 +2238,7 @@
struct epoch_tracker et;
NET_EPOCH_ENTER(et);
- error = tp->t_fb->tfb_tcp_output(tp);
+ error = tcp_output(tp);
NET_EPOCH_EXIT(et);
}
}
@@ -2767,7 +2767,7 @@
sbflush(&so->so_rcv);
tcp_usrclosed(tp);
if (!(inp->inp_flags & INP_DROPPED))
- tp->t_fb->tfb_tcp_output(tp);
+ tcp_output(tp);
}
}
Index: sys/netinet/toecore.c
===================================================================
--- sys/netinet/toecore.c
+++ sys/netinet/toecore.c
@@ -532,7 +532,7 @@
KASSERT(!(tp->t_flags & TF_TOE),
("%s: tp %p still offloaded.", __func__, tp));
tcp_timer_activate(tp, TT_KEEP, TP_KEEPINIT(tp));
- (void) tp->t_fb->tfb_tcp_output(tp);
+ (void) tcp_output(tp);
} else {
tp = tcp_drop(tp, err);
if (tp == NULL)

File Metadata

Mime Type
text/plain
Expires
Fri, Jan 31, 2:28 AM (3 h, 7 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16351895
Default Alt Text
D33366.id99948.diff (9 KB)

Event Timeline