aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd/drbd_receiver.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/block/drbd/drbd_receiver.c')
-rw-r--r--drivers/block/drbd/drbd_receiver.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index bb92671d1f16..aa6c52c80e2e 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -888,17 +888,12 @@ retry:
888 } 888 }
889 } 889 }
890 890
891 if (drbd_request_state(mdev, NS(conn, C_WF_REPORT_PARAMS)) < SS_SUCCESS)
892 return 0;
893
894 sock->sk->sk_sndtimeo = mdev->net_conf->timeout*HZ/10; 891 sock->sk->sk_sndtimeo = mdev->net_conf->timeout*HZ/10;
895 sock->sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT; 892 sock->sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT;
896 893
897 atomic_set(&mdev->packet_seq, 0); 894 atomic_set(&mdev->packet_seq, 0);
898 mdev->peer_seq = 0; 895 mdev->peer_seq = 0;
899 896
900 drbd_thread_start(&mdev->asender);
901
902 if (drbd_send_protocol(mdev) == -1) 897 if (drbd_send_protocol(mdev) == -1)
903 return -1; 898 return -1;
904 drbd_send_sync_param(mdev, &mdev->sync_conf); 899 drbd_send_sync_param(mdev, &mdev->sync_conf);
@@ -907,6 +902,11 @@ retry:
907 drbd_send_state(mdev); 902 drbd_send_state(mdev);
908 clear_bit(USE_DEGR_WFC_T, &mdev->flags); 903 clear_bit(USE_DEGR_WFC_T, &mdev->flags);
909 clear_bit(RESIZE_PENDING, &mdev->flags); 904 clear_bit(RESIZE_PENDING, &mdev->flags);
905
906 if (drbd_request_state(mdev, NS(conn, C_WF_REPORT_PARAMS)) < SS_SUCCESS)
907 return 0;
908
909 drbd_thread_start(&mdev->asender);
910 mod_timer(&mdev->request_timer, jiffies + HZ); /* just start it here. */ 910 mod_timer(&mdev->request_timer, jiffies + HZ); /* just start it here. */
911 911
912 return 1; 912 return 1;