From b6b778d44d6a6477dc4e297dfe3918fcd121f870 Mon Sep 17 00:00:00 2001
From: Steffen Klassert <steffen.klassert@secunet.com>
Date: Wed, 29 Jun 2011 23:20:41 +0000
Subject: [PATCH] --- yaml --- r: 254674 b: refs/heads/master c:
 b00897b881f775040653955fda99dcf7c167b382 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/net/ipv4/xfrm4_output.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index dce0eb7cf8b5..109d1802d11c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c146066ab80267c3305de5dda6a4083f06df9265
+refs/heads/master: b00897b881f775040653955fda99dcf7c167b382
diff --git a/trunk/net/ipv4/xfrm4_output.c b/trunk/net/ipv4/xfrm4_output.c
index 2d51840e53a1..327a617d594c 100644
--- a/trunk/net/ipv4/xfrm4_output.c
+++ b/trunk/net/ipv4/xfrm4_output.c
@@ -32,7 +32,12 @@ static int xfrm4_tunnel_check_size(struct sk_buff *skb)
 	dst = skb_dst(skb);
 	mtu = dst_mtu(dst);
 	if (skb->len > mtu) {
-		icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED, htonl(mtu));
+		if (skb->sk)
+			ip_local_error(skb->sk, EMSGSIZE, ip_hdr(skb)->daddr,
+				       inet_sk(skb->sk)->inet_dport, mtu);
+		else
+			icmp_send(skb, ICMP_DEST_UNREACH,
+				  ICMP_FRAG_NEEDED, htonl(mtu));
 		ret = -EMSGSIZE;
 	}
 out: