---

yaml --- r: 346228 b: refs/heads/master c: b666dbf h: refs/heads/master v: v3
git-mirror · Nov 9, 2012 · 7062d9e · 7062d9e
1 parent 06b82b9
commit 7062d9e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3174f8c5045ad247563434c4b4897bd89313eafc
+refs/heads/master: b666dbf819f9157a4afef2094ec961d216d802b5
diff --git a/trunk/drivers/block/drbd/drbd_receiver.c b/trunk/drivers/block/drbd/drbd_receiver.c
@@ -985,13 +985,9 @@ static int conn_connect(struct drbd_tconn *tconn)
 				goto out_release_sockets;
 		}
 
-		if (sock.socket && &msock.socket) {
-			ok = drbd_socket_okay(&sock.socket);
-			ok = drbd_socket_okay(&msock.socket) && ok;
-			if (ok)
-				break;
-		}
-	} while (1);
+		ok = drbd_socket_okay(&sock.socket);
+		ok = drbd_socket_okay(&msock.socket) && ok;
+	} while (!ok);
 
 	if (ad.s_listen)
 		sock_release(ad.s_listen);