svn commit: r326093 - head/sys/netinet
Mark Johnston
markj at FreeBSD.org
Wed Nov 22 14:13:41 UTC 2017
Author: markj
Date: Wed Nov 22 14:13:40 2017
New Revision: 326093
URL: https://svnweb.freebsd.org/changeset/base/326093
Log:
Use the right variable for the IP header parameter to tcp:::send.
This addresses a regression from r311225.
MFC after: 1 week
Modified:
head/sys/netinet/tcp_subr.c
Modified: head/sys/netinet/tcp_subr.c
==============================================================================
--- head/sys/netinet/tcp_subr.c Wed Nov 22 14:10:58 2017 (r326092)
+++ head/sys/netinet/tcp_subr.c Wed Nov 22 14:13:40 2017 (r326093)
@@ -1238,16 +1238,20 @@ tcp_respond(struct tcpcb *tp, void *ipgen, struct tcph
if (flags & TH_RST)
TCP_PROBE5(accept__refused, NULL, NULL, m, tp, nth);
- TCP_PROBE5(send, NULL, tp, m, tp, nth);
#ifdef INET6
- if (isipv6)
- (void) ip6_output(m, NULL, NULL, 0, NULL, NULL, inp);
+ if (isipv6) {
+ TCP_PROBE5(send, NULL, tp, ip6, tp, nth);
+ (void)ip6_output(m, NULL, NULL, 0, NULL, NULL, inp);
+ }
#endif /* INET6 */
#if defined(INET) && defined(INET6)
else
#endif
#ifdef INET
- (void) ip_output(m, NULL, NULL, 0, NULL, inp);
+ {
+ TCP_PROBE5(send, NULL, tp, ip, tp, nth);
+ (void)ip_output(m, NULL, NULL, 0, NULL, inp);
+ }
#endif
}
More information about the svn-src-head
mailing list