From c55bda93091178f85c66020c9d9cd65b45b3af07 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Wed, 11 Jul 2012 18:35:12 -0700
Subject: [PATCH] --- yaml --- r: 315123 b: refs/heads/master c:
 d3351b75a7169337877fe6f6f2c019154b6ec1ea h: refs/heads/master i:   315121:
 494c1f136f8fec578a9801f486ddca7fc27f0537   315119:
 a943b27adb4650f431a1a89ac2e9d54479ab85a7 v: v3

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

diff --git a/[refs] b/[refs]
index 0b318f2366fd..d5252ace0538 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1de9243bbfc451962ab716a3f7a7fda26d91c359
+refs/heads/master: d3351b75a7169337877fe6f6f2c019154b6ec1ea
diff --git a/trunk/net/ipv4/icmp.c b/trunk/net/ipv4/icmp.c
index 18e39d1895d4..588514627aa7 100644
--- a/trunk/net/ipv4/icmp.c
+++ b/trunk/net/ipv4/icmp.c
@@ -782,13 +782,7 @@ static void icmp_redirect(struct sk_buff *skb)
 		break;
 	}
 
-	/* Ping wants to see redirects.
-         * Let's pretend they are errors of sorts... */
-	if (iph->protocol == IPPROTO_ICMP &&
-	    iph->ihl >= 5 &&
-	    pskb_may_pull(skb, (iph->ihl<<2)+8)) {
-		ping_err(skb, icmp_hdr(skb)->un.gateway);
-	}
+	icmp_socket_deliver(skb, icmp_hdr(skb)->un.gateway);
 
 out:
 	return;