2 files changed, 10 insertions, 2 deletions

diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index 7799fe82aeb6..d0a67bb31363 100644
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -752,7 +752,7 @@ static int rose_connect(struct socket *sock, struct sockaddr *uaddr, int addr_le
 
                 rose_insert_socket(sk);         /* Finish the bind */
         }
-
+rose_try_next_neigh:
         rose->dest_addr   = addr->srose_addr;
         rose->dest_call   = addr->srose_call;
         rose->rand        = ((long)rose & 0xFFFF) + rose->lci;
@@ -810,6 +810,11 @@ static int rose_connect(struct socket *sock, struct sockaddr *uaddr, int addr_le
         }
 
         if (sk->sk_state != TCP_ESTABLISHED) {
+        /* Try next neighbour */
+                rose->neighbour = rose_get_neigh(&addr->srose_addr, &cause, &diagnostic);
+                if (rose->neighbour)
+                        goto rose_try_next_neigh;
+        /* No more neighbour */
                 sock->state = SS_UNCONNECTED;
                 return sock_error(sk);  /* Always set at this point */
         }
diff --git a/net/rose/rose_dev.c b/net/rose/rose_dev.c
index 9d0bf2a1ea3f..7c279e2659ec 100644
--- a/net/rose/rose_dev.c
+++ b/net/rose/rose_dev.c
@@ -59,6 +59,7 @@ static int rose_rebuild_header(struct sk_buff *skb)
         struct net_device_stats *stats = netdev_priv(dev);
         unsigned char *bp = (unsigned char *)skb->data;
         struct sk_buff *skbn;
+        unsigned int len;
 
 #ifdef CONFIG_INET
         if (arp_find(bp + 7, skb)) {
@@ -75,6 +76,8 @@ static int rose_rebuild_header(struct sk_buff *skb)
 
         kfree_skb(skb);
 
+        len = skbn->len;
+
         if (!rose_route_frame(skbn, NULL)) {
                 kfree_skb(skbn);
                 stats->tx_errors++;
@@ -82,7 +85,7 @@ static int rose_rebuild_header(struct sk_buff *skb)
         }
 
         stats->tx_packets++;
-        stats->tx_bytes += skbn->len;
+        stats->tx_bytes += len;
 #endif
         return 1;
 }