diff options
| author | Dmitry Petukhov | 2014-04-08 22:23:20 +0200 |
|---|---|---|
| committer | David S. Miller | 2014-04-09 21:24:38 +0200 |
| commit | f34c4a35d87949fbb0e0f31eba3c054e9f8199ba (patch) | |
| tree | 34b0e63285ba24f897998fd7dcf7102a107cff61 /net | |
| parent | drivers: net: cpsw: Add default vlan for dual emac case also (diff) | |
| download | kernel-qcow2-linux-f34c4a35d87949fbb0e0f31eba3c054e9f8199ba.tar.gz kernel-qcow2-linux-f34c4a35d87949fbb0e0f31eba3c054e9f8199ba.tar.xz kernel-qcow2-linux-f34c4a35d87949fbb0e0f31eba3c054e9f8199ba.zip | |
l2tp: take PMTU from tunnel UDP socket
When l2tp driver tries to get PMTU for the tunnel destination, it uses
the pointer to struct sock that represents PPPoX socket, while it
should use the pointer that represents UDP socket of the tunnel.
Signed-off-by: Dmitry Petukhov <dmgenp@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/l2tp/l2tp_ppp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c index d276e2d4a589..950909f04ee6 100644 --- a/net/l2tp/l2tp_ppp.c +++ b/net/l2tp/l2tp_ppp.c @@ -753,9 +753,9 @@ static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr, session->deref = pppol2tp_session_sock_put; /* If PMTU discovery was enabled, use the MTU that was discovered */ - dst = sk_dst_get(sk); + dst = sk_dst_get(tunnel->sock); if (dst != NULL) { - u32 pmtu = dst_mtu(__sk_dst_get(sk)); + u32 pmtu = dst_mtu(__sk_dst_get(tunnel->sock)); if (pmtu != 0) session->mtu = session->mru = pmtu - PPPOL2TP_HEADER_OVERHEAD; |