[NET]: sparse warning fixes

Fix a bunch of sparse warnings. Mostly about 0 used as
NULL pointer, and shadowed variable declarations.
One notable case was that hash size should have been unsigned.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 12 insertions, 12 deletions

diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h
index d27ee8c0da..8228b57eb1 100644
--- a/include/net/inet_hashtables.h
+++ b/include/net/inet_hashtables.h
@@ -107,7 +107,7 @@ struct inet_hashinfo {
          */
         struct inet_bind_hashbucket     *bhash;
 
-        int                             bhash_size;
+        unsigned int                    bhash_size;
         unsigned int                    ehash_size;
 
         /* All sockets in TCP_LISTEN state will be in here.  This is the only
diff --git a/include/net/sock.h b/include/net/sock.h
index 74e1f7d90d..453c79d091 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -485,17 +485,17 @@ static inline void sk_add_backlog(struct sock *sk, struct sk_buff *skb)
         skb->next = NULL;
 }
 
-#define sk_wait_event(__sk, __timeo, __condition)               \
-({      int rc;                                                 \
-        release_sock(__sk);                                     \
-        rc = __condition;                                       \
-        if (!rc) {                                              \
-                *(__timeo) = schedule_timeout(*(__timeo));      \
-        }                                                       \
-        lock_sock(__sk);                                        \
-        rc = __condition;                                       \
-        rc;                                                     \
-})
+#define sk_wait_event(__sk, __timeo, __condition)                       \
+        ({      int __rc;                                               \
+                release_sock(__sk);                                     \
+                __rc = __condition;                                     \
+                if (!__rc) {                                            \
+                        *(__timeo) = schedule_timeout(*(__timeo));      \
+                }                                                       \
+                lock_sock(__sk);                                        \
+                __rc = __condition;                                     \
+                __rc;                                                   \
+        })
 
 extern int sk_stream_wait_connect(struct sock *sk, long *timeo_p);
 extern int sk_stream_wait_memory(struct sock *sk, long *timeo_p);