diff options
| author | David S. Miller <davem@davemloft.net> | 2014-09-08 00:41:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-09-08 00:41:53 -0400 |
| commit | eb84d6b60491a3ca3d90d62ee5346b007770d40d (patch) | |
| tree | 22aadf9ada15e1ae5ba4c400aafab6f2541996e6 /net/l2tp | |
| parent | 97a13e5289baa96eaddd06e61d277457d837af3a (diff) | |
| parent | d030671f3f261e528dc6e396a13f10859a74ae7c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/l2tp')
| -rw-r--r-- | net/l2tp/l2tp_ppp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c index 13752d96275e..b704a9356208 100644 --- a/net/l2tp/l2tp_ppp.c +++ b/net/l2tp/l2tp_ppp.c | |||
| @@ -755,7 +755,8 @@ static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr, | |||
| 755 | /* If PMTU discovery was enabled, use the MTU that was discovered */ | 755 | /* If PMTU discovery was enabled, use the MTU that was discovered */ |
| 756 | dst = sk_dst_get(tunnel->sock); | 756 | dst = sk_dst_get(tunnel->sock); |
| 757 | if (dst != NULL) { | 757 | if (dst != NULL) { |
| 758 | u32 pmtu = dst_mtu(__sk_dst_get(tunnel->sock)); | 758 | u32 pmtu = dst_mtu(dst); |
| 759 | |||
| 759 | if (pmtu != 0) | 760 | if (pmtu != 0) |
| 760 | session->mtu = session->mru = pmtu - | 761 | session->mtu = session->mru = pmtu - |
| 761 | PPPOL2TP_HEADER_OVERHEAD; | 762 | PPPOL2TP_HEADER_OVERHEAD; |