--- x/net/netrom/af_netrom.c
+++ y/net/netrom/af_netrom.c
@@ -735,7 +735,7 @@ static int nr_connect(struct socket *soc
 		DEFINE_WAIT(wait);
 
 		for (;;) {
-			prepare_to_wait(sk_sleep(sk), &wait,
+			prepare_to_wait(&sock->wq.wait, &wait,
 					TASK_INTERRUPTIBLE);
 			if (sk->sk_state != TCP_SYN_SENT)
 				break;
@@ -748,7 +748,7 @@ static int nr_connect(struct socket *soc
 			err = -ERESTARTSYS;
 			break;
 		}
-		finish_wait(sk_sleep(sk), &wait);
+		finish_wait(&sock->wq.wait, &wait);
 		if (err)
 			goto out_release;
 	}
@@ -795,7 +795,7 @@ static int nr_accept(struct socket *sock
 	 *	hooked into the SABM we saved
 	 */
 	for (;;) {
-		prepare_to_wait(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
+		prepare_to_wait(&sock->wq.wait, &wait, TASK_INTERRUPTIBLE);
 		skb = skb_dequeue(&sk->sk_receive_queue);
 		if (skb)
 			break;
@@ -813,7 +813,7 @@ static int nr_accept(struct socket *sock
 		err = -ERESTARTSYS;
 		break;
 	}
-	finish_wait(sk_sleep(sk), &wait);
+	finish_wait(&sock->wq.wait, &wait);
 	if (err)
 		goto out_release;