diff options
| author | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2003-06-09 07:40:26 +0000 |
|---|---|---|
| committer | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2003-06-09 07:40:26 +0000 |
| commit | 8d1676992f6c6f897fde850e52a016d4c3cfc1fe (patch) | |
| tree | b9eca6af623fc55075d32e2b5733943ab20e7ee5 /sys/netinet/tcp_output.c | |
| parent | bc786f06fee201918acb3f6ca1e5864d8c58e2bf (diff) | |
backout following:
>use m_pulldown not m_pullup2. fix some bugs in IPv6 tcp_trace().
PR 3283 fixed (confirmed)
Diffstat (limited to 'sys/netinet/tcp_output.c')
| -rw-r--r-- | sys/netinet/tcp_output.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index facb432fbfd..80c927bc06a 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_output.c,v 1.56 2003/06/02 23:28:14 millert Exp $ */ +/* $OpenBSD: tcp_output.c,v 1.57 2003/06/09 07:40:25 itojun Exp $ */ /* $NetBSD: tcp_output.c,v 1.16 1997/06/03 16:17:09 kml Exp $ */ /* @@ -1067,20 +1067,9 @@ send: /* * Trace. */ - if (so->so_options & SO_DEBUG) { - /* TCP template does not fill ip version, so fill it in here */ - struct ip *sip; - sip = mtod(m, struct ip *); - switch (tp->pf) { - case AF_INET: - sip->ip_v = 4; - break; - case AF_INET6: - sip->ip_v = 6; - break; - } - tcp_trace(TA_OUTPUT, tp->t_state, tp, m, 0, len); - } + if (so->so_options & SO_DEBUG) + tcp_trace(TA_OUTPUT, tp->t_state, tp, mtod(m, caddr_t), 0, + len); /* * Fill in IP length and desired time to live and |