svn commit: r360776 - head/sys/netinet/tcp_stacks

[Randall Stewart]

Author: rrs
Date: Thu May  7 10:46:02 2020
New Revision: 360776
URL: https://svnweb.freebsd.org/changeset/base/360776

Log:
  NF has an internal option that changes the tcp_mcopy_m routine slightly (has
  a few extra arguments). Recently that changed to only have one arg extra so
  that two ifdefs around the call are no longer needed. Lets take out the
  extra ifdef and arg.
  
  Sponsored by: Netflix Inc
  Differential Revision: https://reviews.freebsd.org/D24736

Modified:
  head/sys/netinet/tcp_stacks/bbr.c
  head/sys/netinet/tcp_stacks/rack.c

Modified: head/sys/netinet/tcp_stacks/bbr.c
==============================================================================
--- head/sys/netinet/tcp_stacks/bbr.c	Thu May  7 08:58:08 2020	(r360775)
+++ head/sys/netinet/tcp_stacks/bbr.c	Thu May  7 10:46:02 2020	(r360776)
@@ -13420,9 +13420,6 @@ send:
 #endif
 			orig_len = len;
 			m->m_next = tcp_m_copym(
-#ifdef NETFLIX_COPY_ARGS
-				tp,
-#endif
 				mb, moff, &len,
 				if_hw_tsomaxsegcount,
 				if_hw_tsomaxsegsize, msb,

Modified: head/sys/netinet/tcp_stacks/rack.c
==============================================================================
--- head/sys/netinet/tcp_stacks/rack.c	Thu May  7 08:58:08 2020	(r360775)
+++ head/sys/netinet/tcp_stacks/rack.c	Thu May  7 10:46:02 2020	(r360776)
@@ -13353,9 +13353,6 @@ send:
 			else
 				msb = sb;
 			m->m_next = tcp_m_copym(
-#ifdef NETFLIX_COPY_ARGS
-				tp,
-#endif
 				mb, moff, &len,
 				if_hw_tsomaxsegcount, if_hw_tsomaxsegsize, msb,
 				((rsm == NULL) ? hw_tls : 0)