---

yaml --- r: 150631 b: refs/heads/master c: c722c62 h: refs/heads/master i: 150629: bc2a13c 150627: b1998ce 150623: e0f0308 v: v3
git-mirror · Jun 4, 2009 · f23c62e · f23c62e
1 parent 52b192e
commit f23c62e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8c617eae4dc2ea9f3d64472233f2d3dc3c9993c
+refs/heads/master: c722c625dbe2758d53365c0ed7d401b0e286f2cf
diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c
@@ -844,12 +844,12 @@ static void tun_sock_write_space(struct sock *sk)
 	if (!sock_writeable(sk))
 		return;
 
-	if (sk->sk_sleep && waitqueue_active(sk->sk_sleep))
-		wake_up_interruptible_sync(sk->sk_sleep);
-
 	if (!test_and_clear_bit(SOCK_ASYNC_NOSPACE, &sk->sk_socket->flags))
 		return;
 
+	if (sk->sk_sleep && waitqueue_active(sk->sk_sleep))
+		wake_up_interruptible_sync(sk->sk_sleep);
+
 	tun = container_of(sk, struct tun_sock, sk)->tun;
 	kill_fasync(&tun->fasync, SIGIO, POLL_OUT);
 }