path: root/include/net/xfrm.h
diff options
authorHannes Frederic Sowa <hannes@stressinduktion.org>2013-08-26 12:31:19 +0200
committerSteffen Klassert <steffen.klassert@secunet.com>2013-08-26 12:40:53 +0200
commit5a25cf1e310888eb333f9e034be84a8117111d30 (patch)
tree0560fa869eb034e063854e42490c6556f69aa12d /include/net/xfrm.h
parent844d48746e4b281a933aedc0428048a1219b42f4 (diff)
xfrm: revert ipv4 mtu determination to dst_mtu
In commit 0ea9d5e3e0e03a63b11392f5613378977dae7eca ("xfrm: introduce helper for safe determination of mtu") I switched the determination of ipv4 mtus from dst_mtu to ip_skb_dst_mtu. This was an error because in case of IP_PMTUDISC_PROBE we fall back to the interface mtu, which is never correct for ipv4 ipsec. This patch partly reverts 0ea9d5e3e0e03a63b11392f5613378977dae7eca ("xfrm: introduce helper for safe determination of mtu"). Cc: Steffen Klassert <steffen.klassert@secunet.com> Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to 'include/net/xfrm.h')
1 files changed, 0 insertions, 12 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index ac5b0251535..e823786e7c6 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -20,7 +20,6 @@
#include <net/route.h>
#include <net/ipv6.h>
#include <net/ip6_fib.h>
-#include <net/ip6_route.h>
#include <net/flow.h>
#include <linux/interrupt.h>
@@ -1724,15 +1723,4 @@ static inline int xfrm_mark_put(struct sk_buff *skb, const struct xfrm_mark *m)
return ret;
-static inline int xfrm_skb_dst_mtu(struct sk_buff *skb)
- struct sock *sk = skb->sk;
- if (sk && skb->protocol == htons(ETH_P_IPV6))
- return ip6_skb_dst_mtu(skb);
- else if (sk && skb->protocol == htons(ETH_P_IP))
- return ip_skb_dst_mtu(skb);
- return dst_mtu(skb_dst(skb));
#endif /* _NET_XFRM_H */