diff options
author | Hannes Frederic Sowa <hannes@stressinduktion.org> | 2013-08-26 06:31:19 -0400 |
---|---|---|
committer | Steffen Klassert <steffen.klassert@secunet.com> | 2013-08-26 06:40:53 -0400 |
commit | 5a25cf1e310888eb333f9e034be84a8117111d30 (patch) | |
tree | 0560fa869eb034e063854e42490c6556f69aa12d /net/ipv6/xfrm6_output.c | |
parent | 844d48746e4b281a933aedc0428048a1219b42f4 (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 'net/ipv6/xfrm6_output.c')
-rw-r--r-- | net/ipv6/xfrm6_output.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/ipv6/xfrm6_output.c b/net/ipv6/xfrm6_output.c index e092e306882d..6cd625e37706 100644 --- a/net/ipv6/xfrm6_output.c +++ b/net/ipv6/xfrm6_output.c | |||
@@ -140,10 +140,12 @@ static int __xfrm6_output(struct sk_buff *skb) | |||
140 | { | 140 | { |
141 | struct dst_entry *dst = skb_dst(skb); | 141 | struct dst_entry *dst = skb_dst(skb); |
142 | struct xfrm_state *x = dst->xfrm; | 142 | struct xfrm_state *x = dst->xfrm; |
143 | int mtu = xfrm_skb_dst_mtu(skb); | 143 | int mtu; |
144 | 144 | ||
145 | if (mtu < IPV6_MIN_MTU) | 145 | if (skb->protocol == htons(ETH_P_IPV6)) |
146 | mtu = IPV6_MIN_MTU; | 146 | mtu = ip6_skb_dst_mtu(skb); |
147 | else | ||
148 | mtu = dst_mtu(skb_dst(skb)); | ||
147 | 149 | ||
148 | if (skb->len > mtu && xfrm6_local_dontfrag(skb)) { | 150 | if (skb->len > mtu && xfrm6_local_dontfrag(skb)) { |
149 | xfrm6_local_rxpmtu(skb, mtu); | 151 | xfrm6_local_rxpmtu(skb, mtu); |