diff options
author | silby <silby@FreeBSD.org> | 2002-06-14 02:43:20 +0000 |
---|---|---|
committer | silby <silby@FreeBSD.org> | 2002-06-14 02:43:20 +0000 |
commit | 0bbc7c9dc50832c581f689991f9b7d5fa84ba9f9 (patch) | |
tree | d81e580768ff8c7a96e46e644c7128863a0f9f97 | |
parent | acb0745bfa68988b8d0cde904671fa3ec632f361 (diff) | |
download | FreeBSD-src-0bbc7c9dc50832c581f689991f9b7d5fa84ba9f9.zip FreeBSD-src-0bbc7c9dc50832c581f689991f9b7d5fa84ba9f9.tar.gz |
Back out ip_tos/ip_ttl/DF "fix", it just panic'd my box. :)
Pointy-hat to: silby
-rw-r--r-- | sys/netinet/tcp_output.c | 2 | ||||
-rw-r--r-- | sys/netinet/tcp_syncache.c | 18 | ||||
-rw-r--r-- | sys/netinet/tcp_var.h | 1 |
3 files changed, 1 insertions, 20 deletions
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 8a55d28..40ed7ee 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -83,7 +83,7 @@ extern struct mbuf *m_copypack(); #endif -int path_mtu_discovery = 1; +static int path_mtu_discovery = 1; SYSCTL_INT(_net_inet_tcp, OID_AUTO, path_mtu_discovery, CTLFLAG_RW, &path_mtu_discovery, 1, "Enable Path MTU Discovery"); diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index e4c467e..40defbe 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -1128,24 +1128,6 @@ syncache_respond(sc, m) th = (struct tcphdr *)(ip + 1); } - - ip->ip_ttl = sc->sc_tp->t_inpcb->inp_ip_ttl; /* XXX */ - ip->ip_tos = sc->sc_tp->t_inpcb->inp_ip_tos; /* XXX */ - - /* - * See if we should do MTU discovery. We do it only if the following - * are true: - * 1) we have a valid route to the destination - * 2) the MTU is not locked (if it is, then discovery has been - * disabled) - */ - if (path_mtu_discovery - && (rt != NULL) - && rt->rt_flags & RTF_UP - && !(rt->rt_rmx.rmx_locks & RTV_MTU)) { - ip->ip_off |= IP_DF; - } - th->th_sport = sc->sc_inc.inc_lport; th->th_dport = sc->sc_inc.inc_fport; diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index bce5d29..e8eb361 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -432,7 +432,6 @@ extern struct tcpstat tcpstat; /* tcp statistics */ extern int tcp_mssdflt; /* XXX */ extern int tcp_delack_enabled; extern int tcp_do_newreno; -extern int path_mtu_discovery; extern int ss_fltsz; extern int ss_fltsz_local; |