From 3dc32a4e3629074c47b5406121ccc923ccebf1eb Mon Sep 17 00:00:00 2001
From: Philipp Reisner <philipp.reisner@linbit.com>
Date: Thu, 12 Jul 2012 10:22:48 +0200
Subject: [PATCH] --- yaml --- r: 346196 b: refs/heads/master c:
 2820fd396940756904bd7e4136115f493c63d369 h: refs/heads/master v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/block/drbd/drbd_receiver.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index f12a9ba65406..7e14b235433b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5b005ab7091c9ef4ca9b47569a8e27e54588933
+refs/heads/master: 2820fd396940756904bd7e4136115f493c63d369
diff --git a/trunk/drivers/block/drbd/drbd_receiver.c b/trunk/drivers/block/drbd/drbd_receiver.c
index 1e9e5145e3c3..8f25095f390c 100644
--- a/trunk/drivers/block/drbd/drbd_receiver.c
+++ b/trunk/drivers/block/drbd/drbd_receiver.c
@@ -468,11 +468,6 @@ static int drbd_accept(const char **what, struct socket *sock, struct socket **n
 	struct sock *sk = sock->sk;
 	int err = 0;
 
-	*what = "listen";
-	err = sock->ops->listen(sock, 5);
-	if (err < 0)
-		goto out;
-
 	*what = "sock_create_lite";
 	err = sock_create_lite(sk->sk_family, sk->sk_type, sk->sk_protocol,
 			       newsock);
@@ -742,6 +737,11 @@ static struct socket *drbd_wait_for_connect(struct drbd_tconn *tconn)
 	if (err < 0)
 		goto out;
 
+	what = "listen";
+	err = s_listen->ops->listen(s_listen, 5);
+	if (err < 0)
+		goto out;
+
 	err = drbd_accept(&what, s_listen, &s_estab);
 
 out: