D30727.id90736.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D30727.id90736.diff
View Options

	Index: sys/netinet/tcp_stacks/bbr.c
	===================================================================
	--- sys/netinet/tcp_stacks/bbr.c
	+++ sys/netinet/tcp_stacks/bbr.c
	@@ -11441,6 +11441,7 @@
	if ((tp->t_flags & TF_RCVD_TSTMP) && !(to.to_flags & TOF_TS) &&
	((thflags & TH_RST) == 0) && (V_tcp_tolerate_missing_ts == 0)) {
	retval = 0;
	+ m_freem(m);
	goto done_with_input;
	}
	/*
	Index: sys/netinet/tcp_stacks/rack.c
	===================================================================
	--- sys/netinet/tcp_stacks/rack.c
	+++ sys/netinet/tcp_stacks/rack.c
	@@ -13454,6 +13454,7 @@
	#ifdef TCP_ACCOUNTING
	int ack_val_set = 0xf;
	#endif
	+ int nsegs;
	uint32_t us_cts;
	/*
	* tv passed from common code is from either M_TSTMP_LRO or
	@@ -13465,6 +13466,7 @@
	if (m->m_flags & M_ACKCMP) {
	panic("Impossible reach m has ackcmp? m:%p tp:%p", m, tp);
	}
	+ nsegs = m->m_pkthdr.lro_nsegs;
	counter_u64_add(rack_proc_non_comp_ack, 1);
	thflags = th->th_flags;
	#ifdef TCP_ACCOUNTING
	@@ -13607,6 +13609,7 @@
	if ((thflags & TH_SYN) && (thflags & TH_FIN) && V_drop_synfin) {
	way_out = 4;
	retval = 0;
	+ m_freem(m);
	goto done_with_input;
	}
	/*
	@@ -13641,6 +13644,7 @@
	((thflags & TH_RST) == 0) && (V_tcp_tolerate_missing_ts == 0)) {
	way_out = 5;
	retval = 0;
	+ m_freem(m);
	goto done_with_input;
	}

	@@ -13944,7 +13948,7 @@
	way_out = 2;
	}
	done_with_input:
	- rack_log_doseg_done(rack, cts, nxt_pkt, did_out, way_out, max(1, m->m_pkthdr.lro_nsegs));
	+ rack_log_doseg_done(rack, cts, nxt_pkt, did_out, way_out, max(1, nsegs));
	if (did_out)
	rack->r_wanted_output = 0;
	#ifdef INVARIANTS