---

yaml --- r: 320335 b: refs/heads/master c: 85effe1 h: refs/heads/master i: 320333: dc80425 320331: 58fe238 320327: ad625be 320319: c5006ff v: v3
git-mirror · Jul 31, 2012 · fd69265 · fd69265
1 parent 8c37f8e
commit fd69265
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5469155f2bc83bb2c88b0a0370c3d54d87eed06e
+refs/heads/master: 85effe183dd45854d1ad1a370b88cddb403c4c91
diff --git a/trunk/net/ceph/messenger.c b/trunk/net/ceph/messenger.c
@@ -1629,6 +1629,8 @@ static int process_connect(struct ceph_connection *con)
 		if (con->in_reply.flags & CEPH_MSG_CONNECT_LOSSY)
 			set_bit(LOSSYTX, &con->flags);
 
+		con->delay = 0;      /* reset backoff memory */
+
 		prepare_read_tag(con);
 		break;