diff options
| author | smh <smh@FreeBSD.org> | 2017-05-18 03:32:01 +0000 |
|---|---|---|
| committer | smh <smh@FreeBSD.org> | 2017-05-18 03:32:01 +0000 |
| commit | f3701f2336f6474bbfc0ae7ee01811c32400c9f5 (patch) | |
| tree | 33744586fff3860ea734ca4dddec02d43088a83e /sys/netinet/tcp_input.c | |
| parent | 89c4df979530ad70fc93cc1aa124cbd165cdad07 (diff) | |
| download | FreeBSD-src-f3701f2336f6474bbfc0ae7ee01811c32400c9f5.zip FreeBSD-src-f3701f2336f6474bbfc0ae7ee01811c32400c9f5.tar.gz | |
Revert the partial MFC of r313045 which broke dtrace
This removes the mbuf to ipinfo_t translator and switches tcp_autorcvbuf to
use the older mtod macro.
This was originally merged to stable/10 as part of r317375.
Reported by: markj
Reviewed by: markj, hiren
Sponsored by: Multiplay
Differential Revision: https://reviews.freebsd.org/D10769
Diffstat (limited to 'sys/netinet/tcp_input.c')
| -rw-r--r-- | sys/netinet/tcp_input.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 95c4d53..125125a 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1519,7 +1519,8 @@ tcp_autorcvbuf(struct mbuf *m, struct tcphdr *th, struct socket *so, newsize = min(so->so_rcv.sb_hiwat + V_tcp_autorcvbuf_inc, V_tcp_autorcvbuf_max); } - TCP_PROBE6(receive__autoresize, NULL, tp, m, tp, th, newsize); + TCP_PROBE6(receive__autoresize, NULL, tp, mtod(m, const char *), + tp, th, newsize); /* Start over with next RTT. */ tp->rfbuf_ts = 0; |
