diff options
| author |   Guillaume Nault <g.nault@alphalink.fr> | 2018-08-03 12:38:34 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-08-03 10:03:57 -0700 |
| commit | 1f5cd2a0107d4ed95cbd9118e6a5f7ccd3d4d12a (patch) | |
| tree | 1ee06be60cafbb3e7c7df779677842c976d5716d /net/l2tp/l2tp_ppp.c | |
| parent | Merge branch 'hns3-next' (diff) | |
| download | wireguard-linux-1f5cd2a0107d4ed95cbd9118e6a5f7ccd3d4d12a.tar.xz wireguard-linux-1f5cd2a0107d4ed95cbd9118e6a5f7ccd3d4d12a.zip | |
l2tp: define l2tp_tunnel_dst_mtu()
Consolidate retrieval of tunnel's socket mtu in order to simplify
l2tp_eth and l2tp_ppp a bit.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/l2tp/l2tp_ppp.c')
| -rw-r--r-- | net/l2tp/l2tp_ppp.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c index 44cac66284a5..1c6da02f976a 100644 --- a/net/l2tp/l2tp_ppp.c +++ b/net/l2tp/l2tp_ppp.c @@ -93,7 +93,6 @@ #include <linux/nsproxy.h> #include <net/net_namespace.h> #include <net/netns/generic.h> -#include <net/dst.h> #include <net/ip.h> #include <net/udp.h> #include <net/xfrm.h> @@ -554,7 +553,7 @@ static void pppol2tp_show(struct seq_file *m, void *arg) static void pppol2tp_session_init(struct l2tp_session *session) { struct pppol2tp_session *ps; - struct dst_entry *dst; + u32 mtu; session->recv_skb = pppol2tp_recv; #if IS_ENABLED(CONFIG_L2TP_DEBUGFS) @@ -566,15 +565,9 @@ static void pppol2tp_session_init(struct l2tp_session *session) ps->owner = current->pid; /* If PMTU discovery was enabled, use the MTU that was discovered */ - dst = sk_dst_get(session->tunnel->sock); - if (dst) { - u32 pmtu = dst_mtu(dst); - - if (pmtu) - session->mtu = pmtu - PPPOL2TP_HEADER_OVERHEAD; - - dst_release(dst); - } + mtu = l2tp_tunnel_dst_mtu(session->tunnel); + if (mtu) + session->mtu = mtu - PPPOL2TP_HEADER_OVERHEAD; } struct l2tp_connect_info { |