diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2007-11-26 07:10:50 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 17:55:03 -0500 |
commit | 8d8ad9d7c4bfe79bc91b7fc419ecfb9dcdfe6a51 (patch) | |
tree | 4b655c4b898e634f39fd170eeb8d06f45b240660 /net/ipv4/tcp_input.c | |
parent | ce865a61c810c971b47f57c729ec6e9b2d522d94 (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/ipv4/tcp_input.c')
-rw-r--r-- | net/ipv4/tcp_input.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 79996b16b942..97ea3eda206d 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
@@ -3595,9 +3595,9 @@ static void tcp_fin(struct sk_buff *skb, struct sock *sk, struct tcphdr *th) | |||
3595 | /* Do not send POLL_HUP for half duplex close. */ | 3595 | /* Do not send POLL_HUP for half duplex close. */ |
3596 | if (sk->sk_shutdown == SHUTDOWN_MASK || | 3596 | if (sk->sk_shutdown == SHUTDOWN_MASK || |
3597 | sk->sk_state == TCP_CLOSE) | 3597 | sk->sk_state == TCP_CLOSE) |
3598 | sk_wake_async(sk, 1, POLL_HUP); | 3598 | sk_wake_async(sk, SOCK_WAKE_WAITD, POLL_HUP); |
3599 | else | 3599 | else |
3600 | sk_wake_async(sk, 1, POLL_IN); | 3600 | sk_wake_async(sk, SOCK_WAKE_WAITD, POLL_IN); |
3601 | } | 3601 | } |
3602 | } | 3602 | } |
3603 | 3603 | ||
@@ -4956,7 +4956,7 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb, | |||
4956 | 4956 | ||
4957 | if (!sock_flag(sk, SOCK_DEAD)) { | 4957 | if (!sock_flag(sk, SOCK_DEAD)) { |
4958 | sk->sk_state_change(sk); | 4958 | sk->sk_state_change(sk); |
4959 | sk_wake_async(sk, 0, POLL_OUT); | 4959 | sk_wake_async(sk, SOCK_WAKE_IO, POLL_OUT); |
4960 | } | 4960 | } |
4961 | 4961 | ||
4962 | if (sk->sk_write_pending || | 4962 | if (sk->sk_write_pending || |
@@ -5186,9 +5186,9 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb, | |||
5186 | * are not waked up, because sk->sk_sleep == | 5186 | * are not waked up, because sk->sk_sleep == |
5187 | * NULL and sk->sk_socket == NULL. | 5187 | * NULL and sk->sk_socket == NULL. |
5188 | */ | 5188 | */ |
5189 | if (sk->sk_socket) { | 5189 | if (sk->sk_socket) |
5190 | sk_wake_async(sk,0,POLL_OUT); | 5190 | sk_wake_async(sk, |
5191 | } | 5191 | SOCK_WAKE_IO, POLL_OUT); |
5192 | 5192 | ||
5193 | tp->snd_una = TCP_SKB_CB(skb)->ack_seq; | 5193 | tp->snd_una = TCP_SKB_CB(skb)->ack_seq; |
5194 | tp->snd_wnd = ntohs(th->window) << | 5194 | tp->snd_wnd = ntohs(th->window) << |