---

yaml --- r: 315123 b: refs/heads/master c: d3351b7 h: refs/heads/master i: 315121: 494c1f1 315119: a943b27 v: v3
git-mirror · Jul 12, 2012 · c55bda9 · c55bda9
1 parent c63ded1
commit c55bda9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git 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
@@ -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;