diff options
author | Stephen Hemminger <shemminger@linux-foundation.org> | 2007-10-09 04:59:42 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:54:48 -0400 |
commit | cfcabdcc2d5a810208e5bb3974121b7ed60119aa (patch) | |
tree | 1aed711eeecc5a303b57f1fc47e1b5746e8a72c2 /include/net | |
parent | de83c058af25aa97ed4864abab11e90e8dead6e2 (diff) |
[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>
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/inet_hashtables.h | 2 | ||||
-rw-r--r-- | include/net/sock.h | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h index d27ee8c0da3f..8228b57eb18f 100644 --- a/include/net/inet_hashtables.h +++ b/include/net/inet_hashtables.h | |||
@@ -107,7 +107,7 @@ struct inet_hashinfo { | |||
107 | */ | 107 | */ |
108 | struct inet_bind_hashbucket *bhash; | 108 | struct inet_bind_hashbucket *bhash; |
109 | 109 | ||
110 | int bhash_size; | 110 | unsigned int bhash_size; |
111 | unsigned int ehash_size; | 111 | unsigned int ehash_size; |
112 | 112 | ||
113 | /* All sockets in TCP_LISTEN state will be in here. This is the only | 113 | /* 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 74e1f7d90d73..453c79d0915b 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) | |||
485 | skb->next = NULL; | 485 | skb->next = NULL; |
486 | } | 486 | } |
487 | 487 | ||
488 | #define sk_wait_event(__sk, __timeo, __condition) \ | 488 | #define sk_wait_event(__sk, __timeo, __condition) \ |
489 | ({ int rc; \ | 489 | ({ int __rc; \ |
490 | release_sock(__sk); \ | 490 | release_sock(__sk); \ |
491 | rc = __condition; \ | 491 | __rc = __condition; \ |
492 | if (!rc) { \ | 492 | if (!__rc) { \ |
493 | *(__timeo) = schedule_timeout(*(__timeo)); \ | 493 | *(__timeo) = schedule_timeout(*(__timeo)); \ |
494 | } \ | 494 | } \ |
495 | lock_sock(__sk); \ | 495 | lock_sock(__sk); \ |
496 | rc = __condition; \ | 496 | __rc = __condition; \ |
497 | rc; \ | 497 | __rc; \ |
498 | }) | 498 | }) |
499 | 499 | ||
500 | extern int sk_stream_wait_connect(struct sock *sk, long *timeo_p); | 500 | extern int sk_stream_wait_connect(struct sock *sk, long *timeo_p); |
501 | extern int sk_stream_wait_memory(struct sock *sk, long *timeo_p); | 501 | extern int sk_stream_wait_memory(struct sock *sk, long *timeo_p); |