diff options
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
-rw-r--r-- | net/ipv4/tcp_ipv4.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 067213924751..3cf976510497 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
@@ -173,7 +173,7 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) | |||
173 | rt = ip_route_connect(fl4, nexthop, inet->inet_saddr, | 173 | rt = ip_route_connect(fl4, nexthop, inet->inet_saddr, |
174 | RT_CONN_FLAGS(sk), sk->sk_bound_dev_if, | 174 | RT_CONN_FLAGS(sk), sk->sk_bound_dev_if, |
175 | IPPROTO_TCP, | 175 | IPPROTO_TCP, |
176 | orig_sport, orig_dport, sk, true); | 176 | orig_sport, orig_dport, sk); |
177 | if (IS_ERR(rt)) { | 177 | if (IS_ERR(rt)) { |
178 | err = PTR_ERR(rt); | 178 | err = PTR_ERR(rt); |
179 | if (err == -ENETUNREACH) | 179 | if (err == -ENETUNREACH) |
@@ -827,7 +827,7 @@ static int tcp_v4_send_synack(struct sock *sk, struct dst_entry *dst, | |||
827 | const struct inet_request_sock *ireq = inet_rsk(req); | 827 | const struct inet_request_sock *ireq = inet_rsk(req); |
828 | struct flowi4 fl4; | 828 | struct flowi4 fl4; |
829 | int err = -1; | 829 | int err = -1; |
830 | struct sk_buff * skb; | 830 | struct sk_buff *skb; |
831 | 831 | ||
832 | /* First, grab a route. */ | 832 | /* First, grab a route. */ |
833 | if (!dst && (dst = inet_csk_route_req(sk, &fl4, req)) == NULL) | 833 | if (!dst && (dst = inet_csk_route_req(sk, &fl4, req)) == NULL) |
@@ -1668,7 +1668,6 @@ struct sock *tcp_v4_syn_recv_sock(struct sock *sk, struct sk_buff *skb, | |||
1668 | } | 1668 | } |
1669 | sk_setup_caps(newsk, dst); | 1669 | sk_setup_caps(newsk, dst); |
1670 | 1670 | ||
1671 | tcp_mtup_init(newsk); | ||
1672 | tcp_sync_mss(newsk, dst_mtu(dst)); | 1671 | tcp_sync_mss(newsk, dst_mtu(dst)); |
1673 | newtp->advmss = dst_metric_advmss(dst); | 1672 | newtp->advmss = dst_metric_advmss(dst); |
1674 | if (tcp_sk(sk)->rx_opt.user_mss && | 1673 | if (tcp_sk(sk)->rx_opt.user_mss && |