diff options
Diffstat (limited to 'net/dccp')
-rw-r--r-- | net/dccp/output.c | 6 | ||||
-rw-r--r-- | net/dccp/proto.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/dccp/output.c b/net/dccp/output.c index e98b65e9569f..2d3dcb39851f 100644 --- a/net/dccp/output.c +++ b/net/dccp/output.c | |||
@@ -198,7 +198,7 @@ void dccp_write_space(struct sock *sk) | |||
198 | read_lock(&sk->sk_callback_lock); | 198 | read_lock(&sk->sk_callback_lock); |
199 | 199 | ||
200 | if (sk_has_sleeper(sk)) | 200 | if (sk_has_sleeper(sk)) |
201 | wake_up_interruptible(sk->sk_sleep); | 201 | wake_up_interruptible(sk_sleep(sk)); |
202 | /* Should agree with poll, otherwise some programs break */ | 202 | /* Should agree with poll, otherwise some programs break */ |
203 | if (sock_writeable(sk)) | 203 | if (sock_writeable(sk)) |
204 | sk_wake_async(sk, SOCK_WAKE_SPACE, POLL_OUT); | 204 | sk_wake_async(sk, SOCK_WAKE_SPACE, POLL_OUT); |
@@ -225,7 +225,7 @@ static int dccp_wait_for_ccid(struct sock *sk, struct sk_buff *skb, int delay) | |||
225 | dccp_pr_debug("delayed send by %d msec\n", delay); | 225 | dccp_pr_debug("delayed send by %d msec\n", delay); |
226 | jiffdelay = msecs_to_jiffies(delay); | 226 | jiffdelay = msecs_to_jiffies(delay); |
227 | 227 | ||
228 | prepare_to_wait(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE); | 228 | prepare_to_wait(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE); |
229 | 229 | ||
230 | sk->sk_write_pending++; | 230 | sk->sk_write_pending++; |
231 | release_sock(sk); | 231 | release_sock(sk); |
@@ -241,7 +241,7 @@ static int dccp_wait_for_ccid(struct sock *sk, struct sk_buff *skb, int delay) | |||
241 | rc = ccid_hc_tx_send_packet(dp->dccps_hc_tx_ccid, sk, skb); | 241 | rc = ccid_hc_tx_send_packet(dp->dccps_hc_tx_ccid, sk, skb); |
242 | } while ((delay = rc) > 0); | 242 | } while ((delay = rc) > 0); |
243 | out: | 243 | out: |
244 | finish_wait(sk->sk_sleep, &wait); | 244 | finish_wait(sk_sleep(sk), &wait); |
245 | return rc; | 245 | return rc; |
246 | 246 | ||
247 | do_error: | 247 | do_error: |
diff --git a/net/dccp/proto.c b/net/dccp/proto.c index a0e38d8018f5..b03ecf6b2bb0 100644 --- a/net/dccp/proto.c +++ b/net/dccp/proto.c | |||
@@ -312,7 +312,7 @@ unsigned int dccp_poll(struct file *file, struct socket *sock, | |||
312 | unsigned int mask; | 312 | unsigned int mask; |
313 | struct sock *sk = sock->sk; | 313 | struct sock *sk = sock->sk; |
314 | 314 | ||
315 | sock_poll_wait(file, sk->sk_sleep, wait); | 315 | sock_poll_wait(file, sk_sleep(sk), wait); |
316 | if (sk->sk_state == DCCP_LISTEN) | 316 | if (sk->sk_state == DCCP_LISTEN) |
317 | return inet_csk_listen_poll(sk); | 317 | return inet_csk_listen_poll(sk); |
318 | 318 | ||