aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp
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/dccp
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/dccp')
-rw-r--r--net/dccp/input.c8
-rw-r--r--net/dccp/output.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/net/dccp/input.c b/net/dccp/input.c
index df0fb2c149a6..ef299fbd7c26 100644
--- a/net/dccp/input.c
+++ b/net/dccp/input.c
@@ -37,7 +37,7 @@ static void dccp_rcv_close(struct sock *sk, struct sk_buff *skb)
37 dccp_send_reset(sk, DCCP_RESET_CODE_CLOSED); 37 dccp_send_reset(sk, DCCP_RESET_CODE_CLOSED);
38 dccp_fin(sk, skb); 38 dccp_fin(sk, skb);
39 dccp_set_state(sk, DCCP_CLOSED); 39 dccp_set_state(sk, DCCP_CLOSED);
40 sk_wake_async(sk, 1, POLL_HUP); 40 sk_wake_async(sk, SOCK_WAKE_WAITD, POLL_HUP);
41} 41}
42 42
43static void dccp_rcv_closereq(struct sock *sk, struct sk_buff *skb) 43static void dccp_rcv_closereq(struct sock *sk, struct sk_buff *skb)
@@ -90,7 +90,7 @@ static void dccp_rcv_reset(struct sock *sk, struct sk_buff *skb)
90 dccp_fin(sk, skb); 90 dccp_fin(sk, skb);
91 91
92 if (err && !sock_flag(sk, SOCK_DEAD)) 92 if (err && !sock_flag(sk, SOCK_DEAD))
93 sk_wake_async(sk, 0, POLL_ERR); 93 sk_wake_async(sk, SOCK_WAKE_IO, POLL_ERR);
94 dccp_time_wait(sk, DCCP_TIME_WAIT, 0); 94 dccp_time_wait(sk, DCCP_TIME_WAIT, 0);
95} 95}
96 96
@@ -416,7 +416,7 @@ static int dccp_rcv_request_sent_state_process(struct sock *sk,
416 416
417 if (!sock_flag(sk, SOCK_DEAD)) { 417 if (!sock_flag(sk, SOCK_DEAD)) {
418 sk->sk_state_change(sk); 418 sk->sk_state_change(sk);
419 sk_wake_async(sk, 0, POLL_OUT); 419 sk_wake_async(sk, SOCK_WAKE_IO, POLL_OUT);
420 } 420 }
421 421
422 if (sk->sk_write_pending || icsk->icsk_ack.pingpong || 422 if (sk->sk_write_pending || icsk->icsk_ack.pingpong ||
@@ -624,7 +624,7 @@ int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
624 switch (old_state) { 624 switch (old_state) {
625 case DCCP_PARTOPEN: 625 case DCCP_PARTOPEN:
626 sk->sk_state_change(sk); 626 sk->sk_state_change(sk);
627 sk_wake_async(sk, 0, POLL_OUT); 627 sk_wake_async(sk, SOCK_WAKE_IO, POLL_OUT);
628 break; 628 break;
629 } 629 }
630 } else if (unlikely(dh->dccph_type == DCCP_PKT_SYNC)) { 630 } else if (unlikely(dh->dccph_type == DCCP_PKT_SYNC)) {
diff --git a/net/dccp/output.c b/net/dccp/output.c
index f49544618f20..33ce737ef3a8 100644
--- a/net/dccp/output.c
+++ b/net/dccp/output.c
@@ -170,7 +170,7 @@ void dccp_write_space(struct sock *sk)
170 wake_up_interruptible(sk->sk_sleep); 170 wake_up_interruptible(sk->sk_sleep);
171 /* Should agree with poll, otherwise some programs break */ 171 /* Should agree with poll, otherwise some programs break */
172 if (sock_writeable(sk)) 172 if (sock_writeable(sk))
173 sk_wake_async(sk, 2, POLL_OUT); 173 sk_wake_async(sk, SOCK_WAKE_SPACE, POLL_OUT);
174 174
175 read_unlock(&sk->sk_callback_lock); 175 read_unlock(&sk->sk_callback_lock);
176} 176}