From 7f45d32a01e659f2bc8e0c18d51e102a3a358f57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi.denis-courmont@nokia.com>
Date: Thu, 24 Feb 2011 23:14:56 +0000
Subject: [PATCH] --- yaml --- r: 237465 b: refs/heads/master c:
 96241544ca34721d601925850868188d6304cc0f h: refs/heads/master i:   237463:
 9b8120d65e460b80508d784df37043db85639a37 v: v3

---
 [refs]                    |  2 +-
 trunk/net/phonet/socket.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 461faf3b4710..c9bc663d94ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b08cd667c4b6641c4d16a3f87f4550f81a6d69ac
+refs/heads/master: 96241544ca34721d601925850868188d6304cc0f
diff --git a/trunk/net/phonet/socket.c b/trunk/net/phonet/socket.c
index 25f746d20c1f..ceb5143f5ef9 100644
--- a/trunk/net/phonet/socket.c
+++ b/trunk/net/phonet/socket.c
@@ -428,19 +428,19 @@ static int pn_socket_listen(struct socket *sock, int backlog)
 	struct sock *sk = sock->sk;
 	int err = 0;
 
-	if (sock->state != SS_UNCONNECTED)
-		return -EINVAL;
 	if (pn_socket_autobind(sock))
 		return -ENOBUFS;
 
 	lock_sock(sk);
-	if (sk->sk_state != TCP_CLOSE) {
+	if (sock->state != SS_UNCONNECTED) {
 		err = -EINVAL;
 		goto out;
 	}
 
-	sk->sk_state = TCP_LISTEN;
-	sk->sk_ack_backlog = 0;
+	if (sk->sk_state != TCP_LISTEN) {
+		sk->sk_state = TCP_LISTEN;
+		sk->sk_ack_backlog = 0;
+	}
 	sk->sk_max_ack_backlog = backlog;
 out:
 	release_sock(sk);