ipv4: Deliver ICMP redirects to sockets too.

And thus, we can remove the ping_err() hack.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 18e39d1895d45b5dc7c2e0005fbcc0c1d8505562..588514627aa7060fba774d65ff0693a1c999739e 100644 (file)
--- a/net/ipv4/icmp.c
+++ b/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;