diff options
| author |   David S. Miller <davem@davemloft.net> | 2012-07-16 03:28:06 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-16 03:28:06 -0700 |
| commit | 80d0a69fc57715dc9080c0567df1ed911b78abea (patch) | |
| tree | feb310b5075d3a4f118fcdde7bc44970b1c3f07e /net/ipv4/tcp_ipv4.c | |
| parent | xfrm: Initialize the struct xfrm_dst behind the dst_enty field (diff) | |
| download | linux-dev-80d0a69fc57715dc9080c0567df1ed911b78abea.tar.xz linux-dev-80d0a69fc57715dc9080c0567df1ed911b78abea.zip | |
ipv4: Add helper inet_csk_update_pmtu().
This abstracts away the call to dst_ops->update_pmtu() so that we can
transparently handle the fact that, in the future, the dst itself can
be invalidated by the PMTU update (when we have non-host routes cached
in sockets).
So we try to rebuild the socket cached route after the method
invocation if necessary.
This isn't used by SCTP because it needs to cache dsts per-transport,
and thus will need it's own local version of this helper.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 7a0062cb4ed0..b8e7e0595407 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -289,17 +289,10 @@ static void do_pmtu_discovery(struct sock *sk, const struct iphdr *iph, u32 mtu) if (sk->sk_state == TCP_LISTEN) return; - /* We don't check in the destentry if pmtu discovery is forbidden - * on this route. We just assume that no packet_to_big packets - * are send back when pmtu discovery is not active. - * There is a small race when the user changes this flag in the - * route, but I think that's acceptable. - */ - if ((dst = __sk_dst_check(sk, 0)) == NULL) + dst = inet_csk_update_pmtu(sk, mtu); + if (!dst) return; - dst->ops->update_pmtu(dst, mtu); - /* Something is about to be wrong... Remember soft error * for the case, if this connection will not able to recover. */ |