aboutsummaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2007-11-26 07:10:50 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 17:55:03 -0500
commit8d8ad9d7c4bfe79bc91b7fc419ecfb9dcdfe6a51 (patch)
tree4b655c4b898e634f39fd170eeb8d06f45b240660 /net/core
parentce865a61c810c971b47f57c729ec6e9b2d522d94 (diff)
[NET]: Name magic constants in sock_wake_async()
The sock_wake_async() performs a bit different actions depending on "how" argument. Unfortunately this argument ony has numerical magic values. I propose to give names to their constants to help people reading this function callers understand what's going on without looking into this function all the time. I suppose this is 2.6.25 material, but if it's not (or the naming seems poor/bad/awful), I can rework it against the current net-2.6 tree. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/sock.c8
-rw-r--r--net/core/stream.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/net/core/sock.c b/net/core/sock.c
index eac7aa0721da..118214047ed2 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1498,7 +1498,7 @@ static void sock_def_error_report(struct sock *sk)
1498 read_lock(&sk->sk_callback_lock); 1498 read_lock(&sk->sk_callback_lock);
1499 if (sk->sk_sleep && waitqueue_active(sk->sk_sleep)) 1499 if (sk->sk_sleep && waitqueue_active(sk->sk_sleep))
1500 wake_up_interruptible(sk->sk_sleep); 1500 wake_up_interruptible(sk->sk_sleep);
1501 sk_wake_async(sk,0,POLL_ERR); 1501 sk_wake_async(sk, SOCK_WAKE_IO, POLL_ERR);
1502 read_unlock(&sk->sk_callback_lock); 1502 read_unlock(&sk->sk_callback_lock);
1503} 1503}
1504 1504
@@ -1507,7 +1507,7 @@ static void sock_def_readable(struct sock *sk, int len)
1507 read_lock(&sk->sk_callback_lock); 1507 read_lock(&sk->sk_callback_lock);
1508 if (sk->sk_sleep && waitqueue_active(sk->sk_sleep)) 1508 if (sk->sk_sleep && waitqueue_active(sk->sk_sleep))
1509 wake_up_interruptible(sk->sk_sleep); 1509 wake_up_interruptible(sk->sk_sleep);
1510 sk_wake_async(sk,1,POLL_IN); 1510 sk_wake_async(sk, SOCK_WAKE_WAITD, POLL_IN);
1511 read_unlock(&sk->sk_callback_lock); 1511 read_unlock(&sk->sk_callback_lock);
1512} 1512}
1513 1513
@@ -1524,7 +1524,7 @@ static void sock_def_write_space(struct sock *sk)
1524 1524
1525 /* Should agree with poll, otherwise some programs break */ 1525 /* Should agree with poll, otherwise some programs break */
1526 if (sock_writeable(sk)) 1526 if (sock_writeable(sk))
1527 sk_wake_async(sk, 2, POLL_OUT); 1527 sk_wake_async(sk, SOCK_WAKE_SPACE, POLL_OUT);
1528 } 1528 }
1529 1529
1530 read_unlock(&sk->sk_callback_lock); 1530 read_unlock(&sk->sk_callback_lock);
@@ -1539,7 +1539,7 @@ void sk_send_sigurg(struct sock *sk)
1539{ 1539{
1540 if (sk->sk_socket && sk->sk_socket->file) 1540 if (sk->sk_socket && sk->sk_socket->file)
1541 if (send_sigurg(&sk->sk_socket->file->f_owner)) 1541 if (send_sigurg(&sk->sk_socket->file->f_owner))
1542 sk_wake_async(sk, 3, POLL_PRI); 1542 sk_wake_async(sk, SOCK_WAKE_URG, POLL_PRI);
1543} 1543}
1544 1544
1545void sk_reset_timer(struct sock *sk, struct timer_list* timer, 1545void sk_reset_timer(struct sock *sk, struct timer_list* timer,
diff --git a/net/core/stream.c b/net/core/stream.c
index b2fb846f42a4..5586879bb9b3 100644
--- a/net/core/stream.c
+++ b/net/core/stream.c
@@ -35,7 +35,7 @@ void sk_stream_write_space(struct sock *sk)
35 if (sk->sk_sleep && waitqueue_active(sk->sk_sleep)) 35 if (sk->sk_sleep && waitqueue_active(sk->sk_sleep))
36 wake_up_interruptible(sk->sk_sleep); 36 wake_up_interruptible(sk->sk_sleep);
37 if (sock->fasync_list && !(sk->sk_shutdown & SEND_SHUTDOWN)) 37 if (sock->fasync_list && !(sk->sk_shutdown & SEND_SHUTDOWN))
38 sock_wake_async(sock, 2, POLL_OUT); 38 sock_wake_async(sock, SOCK_WAKE_SPACE, POLL_OUT);
39 } 39 }
40} 40}
41 41