1 files changed, 8 insertions, 9 deletions

diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index 208d5439e59b..a93f260cf24c 100644
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@ -64,11 +64,11 @@ EXPORT_SYMBOL_GPL(pingv6_ops);
 
 static u16 ping_port_rover;
 
-static inline int ping_hashfn(struct net *net, unsigned int num, unsigned int mask)
+static inline u32 ping_hashfn(const struct net *net, u32 num, u32 mask)
 {
-        int res = (num + net_hash_mix(net)) & mask;
+        u32 res = (num + net_hash_mix(net)) & mask;
 
-        pr_debug("hash(%d) = %d\n", num, res);
+        pr_debug("hash(%u) = %u\n", num, res);
         return res;
 }
 EXPORT_SYMBOL_GPL(ping_hash);
@@ -516,7 +516,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
                  ntohs(icmph->un.echo.sequence));
 
         sk = ping_lookup(net, skb, ntohs(icmph->un.echo.id));
-        if (sk == NULL) {
+        if (!sk) {
                 pr_debug("no socket, dropping\n");
                 return; /* No socket for error */
         }
@@ -692,8 +692,7 @@ int ping_common_sendmsg(int family, struct msghdr *msg, size_t len,
 }
 EXPORT_SYMBOL_GPL(ping_common_sendmsg);
 
-static int ping_v4_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
-                           size_t len)
+static int ping_v4_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
 {
         struct net *net = sock_net(sk);
         struct flowi4 fl4;
@@ -849,8 +848,8 @@ do_confirm:
         goto out;
 }
 
-int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
-                 size_t len, int noblock, int flags, int *addr_len)
+int ping_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int noblock,
+                 int flags, int *addr_len)
 {
         struct inet_sock *isk = inet_sk(sk);
         int family = sk->sk_family;
@@ -972,7 +971,7 @@ bool ping_rcv(struct sk_buff *skb)
         skb_push(skb, skb->data - (u8 *)icmph);
 
         sk = ping_lookup(net, skb, ntohs(icmph->un.echo.id));
-        if (sk != NULL) {
+        if (sk) {
                 struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC);
 
                 pr_debug("rcv on socket %p\n", sk);