diff options
Diffstat (limited to 'net/dccp')
-rw-r--r-- | net/dccp/input.c | 8 | ||||
-rw-r--r-- | net/dccp/output.c | 2 |
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 | ||
43 | static void dccp_rcv_closereq(struct sock *sk, struct sk_buff *skb) | 43 | static 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 | } |