diff options
Diffstat (limited to 'include/net/sock.h')
| -rw-r--r-- | include/net/sock.h | 22 |
1 files changed, 11 insertions, 11 deletions
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); |