Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux-2.6-block.git] / net / ipv4 / ping.c

diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index d3a27165f9cca0f20f68616295cfbf683fb4adc0..76dce90c4581c1b0e1502bcf6075716be2940ff3 100644 (file)
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@ -145,10 +145,12 @@ fail:
 }
 EXPORT_SYMBOL_GPL(ping_get_port);
 
-void ping_hash(struct sock *sk)
+int ping_hash(struct sock *sk)
 {
        pr_debug("ping_hash(sk->port=%u)\n", inet_sk(sk)->inet_num);
        BUG(); /* "Please do not press this button again." */
+
+       return 0;
 }
 
 void ping_unhash(struct sock *sk)