diff options
| author | wollman <wollman@FreeBSD.org> | 1995-09-22 20:05:58 +0000 |
|---|---|---|
| committer | wollman <wollman@FreeBSD.org> | 1995-09-22 20:05:58 +0000 |
| commit | cd0bc69e2fdd7da07a0ea1b0778e950cc972d08b (patch) | |
| tree | 7fd1e55cca1703f661c7985b3d362e80e3c6b845 /sys/netinet/tcp_output.c | |
| parent | 13f02e87b759638329f4492edb6868d9308ef089 (diff) | |
| download | FreeBSD-src-cd0bc69e2fdd7da07a0ea1b0778e950cc972d08b.zip FreeBSD-src-cd0bc69e2fdd7da07a0ea1b0778e950cc972d08b.tar.gz | |
Merge 4.4-Lite-2: update version number (we already have the same fixes).
Obtained from: 4.4BSD-Lite-2
Diffstat (limited to 'sys/netinet/tcp_output.c')
| -rw-r--r-- | sys/netinet/tcp_output.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index f5500ee..b14d645 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1982, 1986, 1988, 1990, 1993 + * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1995 * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,8 +30,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)tcp_output.c 8.3 (Berkeley) 12/30/93 - * $Id: tcp_output.c,v 1.12 1995/09/13 17:36:31 wollman Exp $ + * @(#)tcp_output.c 8.4 (Berkeley) 5/24/95 + * $Id: tcp_output.c,v 1.13 1995/09/20 21:00:58 wollman Exp $ */ #include <sys/param.h> @@ -436,7 +436,6 @@ send: * If there is still more to send, don't close the connection. */ flags &= ~TH_FIN; - len = tp->t_maxopd - optlen; sendalot = 1; } @@ -487,7 +486,7 @@ send: } else { m->m_next = m_copy(so->so_snd.sb_mb, off, (int) len); if (m->m_next == 0) { - m_free(m); + (void) m_free(m); error = ENOBUFS; goto out; } |
