diff options
| author | cperciva <cperciva@FreeBSD.org> | 2011-07-05 18:49:55 +0000 |
|---|---|---|
| committer | cperciva <cperciva@FreeBSD.org> | 2011-07-05 18:49:55 +0000 |
| commit | bb60a806050cef5f2efadf036fe596af113d8426 (patch) | |
| tree | 1fbfbb447a35fdface639f7d78c8d017dc04db78 /sys/netinet/tcp_output.c | |
| parent | 08babefd2275ac4da3bc8eb796e7ef1b81ee7495 (diff) | |
| download | FreeBSD-src-bb60a806050cef5f2efadf036fe596af113d8426.zip FreeBSD-src-bb60a806050cef5f2efadf036fe596af113d8426.tar.gz | |
Remove #ifdef notyet code dating back to 4.3BSD Net/2 (and possibly earlier).
I think the benefit of making the code cleaner and easier to understand
outweighs the humour of leaving this intact (or possibly changing it to
#ifdef not_yet_and_probably_never).
MFC after: 2 weeks
Diffstat (limited to 'sys/netinet/tcp_output.c')
| -rw-r--r-- | sys/netinet/tcp_output.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 4542ac5..572a491 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -84,10 +84,6 @@ __FBSDID("$FreeBSD$"); #include <security/mac/mac_framework.h> -#ifdef notyet -extern struct mbuf *m_copypack(); -#endif - VNET_DEFINE(int, path_mtu_discovery) = 1; SYSCTL_VNET_INT(_net_inet_tcp, OID_AUTO, path_mtu_discovery, CTLFLAG_RW, &VNET_NAME(path_mtu_discovery), 1, @@ -820,19 +816,6 @@ send: TCPSTAT_INC(tcps_sndpack); TCPSTAT_ADD(tcps_sndbyte, len); } -#ifdef notyet - if ((m = m_copypack(so->so_snd.sb_mb, off, - (int)len, max_linkhdr + hdrlen)) == 0) { - SOCKBUF_UNLOCK(&so->so_snd); - error = ENOBUFS; - goto out; - } - /* - * m_copypack left space for our hdr; use it. - */ - m->m_len += hdrlen; - m->m_data -= hdrlen; -#else MGETHDR(m, M_DONTWAIT, MT_DATA); if (m == NULL) { SOCKBUF_UNLOCK(&so->so_snd); @@ -872,7 +855,7 @@ send: goto out; } } -#endif /* notyet */ + /* * If we're sending everything we've got, set PUSH. * (This will keep happy those implementations which only |
