aboutsummaryrefslogtreecommitdiffstats
path: root/net/rose/af_rose.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/rose/af_rose.c')
-rw-r--r--net/rose/af_rose.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index d952e7eac188..5ee0c62046a0 100644
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -803,7 +803,6 @@ static int rose_connect(struct socket *sock, struct sockaddr *uaddr, int addr_le
803 803
804 rose_insert_socket(sk); /* Finish the bind */ 804 rose_insert_socket(sk); /* Finish the bind */
805 } 805 }
806rose_try_next_neigh:
807 rose->dest_addr = addr->srose_addr; 806 rose->dest_addr = addr->srose_addr;
808 rose->dest_call = addr->srose_call; 807 rose->dest_call = addr->srose_call;
809 rose->rand = ((long)rose & 0xFFFF) + rose->lci; 808 rose->rand = ((long)rose & 0xFFFF) + rose->lci;
@@ -865,12 +864,6 @@ rose_try_next_neigh:
865 } 864 }
866 865
867 if (sk->sk_state != TCP_ESTABLISHED) { 866 if (sk->sk_state != TCP_ESTABLISHED) {
868 /* Try next neighbour */
869 rose->neighbour = rose_get_neigh(&addr->srose_addr, &cause, &diagnostic, 0);
870 if (rose->neighbour)
871 goto rose_try_next_neigh;
872
873 /* No more neighbours */
874 sock->state = SS_UNCONNECTED; 867 sock->state = SS_UNCONNECTED;
875 err = sock_error(sk); /* Always set at this point */ 868 err = sock_error(sk); /* Always set at this point */
876 goto out_release; 869 goto out_release;