diff --git a/[refs] b/[refs]
index 4ce09baac7e0..a5605795ecbf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da39822c6565095a0151ccf9d6b95e2ae5612885
+refs/heads/master: 04177882265bc5014300a631e7384f8fe6b6aa0f
diff --git a/trunk/net/ceph/messenger.c b/trunk/net/ceph/messenger.c
index 3cdbb8853cd7..35c0000a658e 100644
--- a/trunk/net/ceph/messenger.c
+++ b/trunk/net/ceph/messenger.c
@@ -1355,7 +1355,9 @@ static int process_connect(struct ceph_connection *con)
 		 * to WAIT.  This shouldn't happen if we are the
 		 * client.
 		 */
-		pr_err("process_connect peer connecting WAIT\n");
+		pr_err("process_connect got WAIT as client\n");
+		con->error_msg = "protocol error, got WAIT as client";
+		return -1;
 
 	default:
 		pr_err("connect protocol error, will retry\n");