Merge remote-tracking branches 'asoc/topic/es8328', 'asoc/topic/find-dai', 'asoc...

[deliverable/linux.git] / net / ipv4 / ping.c

diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index d3a27165f9cca0f20f68616295cfbf683fb4adc0..cf9700b1a1061404abb62c906afac1cacb43657a 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)
@@ -1140,13 +1142,6 @@ static int ping_v4_seq_show(struct seq_file *seq, void *v)
        return 0;
 }
 
-static const struct seq_operations ping_v4_seq_ops = {
-       .show           = ping_v4_seq_show,
-       .start          = ping_v4_seq_start,
-       .next           = ping_seq_next,
-       .stop           = ping_seq_stop,
-};
-
 static int ping_seq_open(struct inode *inode, struct file *file)
 {
        struct ping_seq_afinfo *afinfo = PDE_DATA(inode);