diff -ruNp linux-2.6.25.8-10/net/rose/af_rose.c linux/net/rose/af_rose.c --- a/net/rose/af_rose.c 2008-06-22 07:25:26.000000000 +0200 +++ b/net/rose/af_rose.c 2008-07-11 17:54:27.000000000 +0200 @@ -63,7 +63,7 @@ int sysctl_rose_window_size static HLIST_HEAD(rose_list); static DEFINE_SPINLOCK(rose_list_lock); -static struct proto_ops rose_proto_ops; +static const struct proto_ops rose_proto_ops; ax25_address rose_callsign; @@ -161,7 +161,10 @@ void rose_kill_by_neigh(struct rose_neig if (rose->neighbour == neigh) { rose_disconnect(s, ENETUNREACH, ROSE_OUT_OF_ORDER, 0); - rose->neighbour->use--; + if (rose->neighbour->use > 0 ) + rose->neighbour->use--; + else + printk(KERN_ERR "ROSE: rose_kill_by_neigh() - neighbour->use-- could be < 0\n"); rose->neighbour = NULL; } } @@ -566,13 +569,11 @@ static struct sock *rose_make_new(struct #endif sk->sk_type = osk->sk_type; - sk->sk_socket = osk->sk_socket; sk->sk_priority = osk->sk_priority; sk->sk_protocol = osk->sk_protocol; sk->sk_rcvbuf = osk->sk_rcvbuf; sk->sk_sndbuf = osk->sk_sndbuf; sk->sk_state = TCP_ESTABLISHED; - sk->sk_sleep = osk->sk_sleep; sock_copy_flags(sk, osk); init_timer(&rose->timer); @@ -759,7 +760,7 @@ static int rose_connect(struct socket *s sock->state = SS_UNCONNECTED; rose->neighbour = rose_get_neigh(&addr->srose_addr, &cause, - &diagnostic); + &diagnostic, 0); if (!rose->neighbour) { err = -ENETUNREACH; goto out_release; @@ -792,7 +793,7 @@ static int rose_connect(struct socket *s rose_insert_socket(sk); /* Finish the bind */ } -rose_try_next_neigh: +/*rose_try_next_neigh: */ rose->dest_addr = addr->srose_addr; rose->dest_call = addr->srose_call; rose->rand = ((long)rose & 0xFFFF) + rose->lci; @@ -854,10 +855,10 @@ rose_try_next_neigh: } if (sk->sk_state != TCP_ESTABLISHED) { - /* Try next neighbour */ - rose->neighbour = rose_get_neigh(&addr->srose_addr, &cause, &diagnostic); + /* Try next neighbour * / + rose->neighbour = rose_get_neigh(&addr->srose_addr, &cause, &diagnostic, 0); if (rose->neighbour) - goto rose_try_next_neigh; + goto rose_try_next_neigh; */ /* No more neighbours */ sock->state = SS_UNCONNECTED; @@ -924,14 +925,12 @@ static int rose_accept(struct socket *so goto out_release; newsk = skb->sk; - newsk->sk_socket = newsock; - newsk->sk_sleep = &newsock->wait; + sock_graft(newsk, newsock); /* Now attach up the new socket */ skb->sk = NULL; kfree_skb(skb); sk->sk_ack_backlog--; - newsock->sk = newsk; out_release: release_sock(sk); @@ -1165,7 +1164,7 @@ static int rose_sendmsg(struct kiocb *io } #ifdef M_BIT -#define ROSE_PACLEN (256-ROSE_MIN_LEN) +#define ROSE_PACLEN (AX25_DEF_PACLEN-ROSE_MIN_LEN) if (skb->len - ROSE_MIN_LEN > ROSE_PACLEN) { unsigned char header[ROSE_MIN_LEN]; struct sk_buff *skbn; @@ -1502,7 +1501,7 @@ static struct net_proto_family rose_fami .owner = THIS_MODULE, }; -static struct proto_ops rose_proto_ops = { +static const struct proto_ops rose_proto_ops = { .family = PF_ROSE, .owner = THIS_MODULE, .release = rose_release, diff -ruNp linux-2.6.25.8-10/net/rose/rose_route.c linux/net/rose/rose_route.c --- a/net/rose/rose_route.c 2008-06-22 07:25:26.000000000 +0200 +++ b/net/rose/rose_route.c 2008-07-11 17:54:27.000000000 +0200 @@ -662,27 +662,34 @@ struct rose_route *rose_route_free_lci(u } /* - * Find a neighbour given a ROSE address. + * Find a neighbour or a route given a ROSE address. */ struct rose_neigh *rose_get_neigh(rose_address *addr, unsigned char *cause, - unsigned char *diagnostic) + unsigned char *diagnostic, int new) { struct rose_neigh *res = NULL; struct rose_node *node; int failed = 0; int i; - spin_lock_bh(&rose_node_list_lock); + if (!new) spin_lock_bh(&rose_node_list_lock); for (node = rose_node_list; node != NULL; node = node->next) { if (rosecmpm(addr, &node->address, node->mask) == 0) { for (i = 0; i < node->count; i++) { - if (!rose_ftimer_running(node->neighbour[i])) { - res = node->neighbour[i]; - goto out; - } else - failed = 1; + if (new) { + if (node->neighbour[i]->restarted) { + res = node->neighbour[i]; + goto out; + } + } + else { + if (!rose_ftimer_running(node->neighbour[i])) { + res = node->neighbour[i]; + goto out; + } else + failed = 1; + } } - break; } } @@ -695,7 +702,7 @@ struct rose_neigh *rose_get_neigh(rose_a } out: - spin_unlock_bh(&rose_node_list_lock); + if (!new) spin_unlock_bh(&rose_node_list_lock); return res; } @@ -857,7 +864,6 @@ int rose_route_frame(struct sk_buff *skb src_addr = (rose_address *)(skb->data + 9); dest_addr = (rose_address *)(skb->data + 4); - spin_lock_bh(&rose_node_list_lock); spin_lock_bh(&rose_neigh_list_lock); spin_lock_bh(&rose_route_list_lock); @@ -1019,7 +1025,7 @@ int rose_route_frame(struct sk_buff *skb rose_route = rose_route->next; } - if ((new_neigh = rose_get_neigh(dest_addr, &cause, &diagnostic)) == NULL) { + if ((new_neigh = rose_get_neigh(dest_addr, &cause, &diagnostic, 1)) == NULL) { rose_transmit_clear_request(rose_neigh, lci, cause, diagnostic); goto out; } @@ -1060,7 +1066,6 @@ int rose_route_frame(struct sk_buff *skb out: spin_unlock_bh(&rose_route_list_lock); spin_unlock_bh(&rose_neigh_list_lock); - spin_unlock_bh(&rose_node_list_lock); return res; } @@ -1068,12 +1073,12 @@ out: #ifdef CONFIG_PROC_FS static void *rose_node_start(struct seq_file *seq, loff_t *pos) - __acquires(rose_neigh_list_lock) + __acquires(rose_node_list_lock) { struct rose_node *rose_node; int i = 1; - spin_lock_bh(&rose_neigh_list_lock); + spin_lock_bh(&rose_node_list_lock); if (*pos == 0) return SEQ_START_TOKEN; @@ -1092,9 +1097,9 @@ static void *rose_node_next(struct seq_f } static void rose_node_stop(struct seq_file *seq, void *v) - __releases(rose_neigh_list_lock) + __releases(rose_node_list_lock) { - spin_unlock_bh(&rose_neigh_list_lock); + spin_unlock_bh(&rose_node_list_lock); } static int rose_node_show(struct seq_file *seq, void *v) diff -ruNp linux-2.6.25.8-10/include/net/rose.h linux/include/net/rose.h --- a/include/net/rose.h 2008-07-11 21:39:42.000000000 +0200 +++ b/include/net/rose.h 2008-06-22 07:25:26.000000000 +0200 @@ -201,7 +201,7 @@ extern void rose_link_device_down(struct extern struct net_device *rose_dev_first(void); extern struct net_device *rose_dev_get(rose_address *); extern struct rose_route *rose_route_free_lci(unsigned int, struct rose_neigh *); -extern struct rose_neigh *rose_get_neigh(rose_address *, unsigned char *, unsigned char *); +extern struct rose_neigh *rose_get_neigh(rose_address *, unsigned char *, unsigned char *, int); extern int rose_rt_ioctl(unsigned int, void __user *); extern void rose_link_failed(ax25_cb *, int); extern int rose_route_frame(struct sk_buff *, ax25_cb *);