Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 30429
b: refs/heads/master
c: 5238367
h: refs/heads/master
i:
  30427: 1416822
v: v3
  • Loading branch information
Ralf Baechle authored and David S. Miller committed Jun 26, 2006
1 parent af97a53 commit 4ff6b01
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 068c6e98bc7ec4419299b38cd40be26ebf4bdeda
refs/heads/master: 52383678a8ac80e6679f94f60c897f9292e0e8b9
12 changes: 8 additions & 4 deletions trunk/net/netrom/nr_route.c
Original file line number Diff line number Diff line change
Expand Up @@ -725,15 +725,17 @@ void nr_link_failed(ax25_cb *ax25, int reason)
struct nr_node *nr_node = NULL;

spin_lock_bh(&nr_neigh_list_lock);
nr_neigh_for_each(s, node, &nr_neigh_list)
nr_neigh_for_each(s, node, &nr_neigh_list) {
if (s->ax25 == ax25) {
nr_neigh_hold(s);
nr_neigh = s;
break;
}
}
spin_unlock_bh(&nr_neigh_list_lock);

if (nr_neigh == NULL) return;
if (nr_neigh == NULL)
return;

nr_neigh->ax25 = NULL;
ax25_cb_put(ax25);
Expand All @@ -743,11 +745,13 @@ void nr_link_failed(ax25_cb *ax25, int reason)
return;
}
spin_lock_bh(&nr_node_list_lock);
nr_node_for_each(nr_node, node, &nr_node_list)
nr_node_for_each(nr_node, node, &nr_node_list) {
nr_node_lock(nr_node);
if (nr_node->which < nr_node->count && nr_node->routes[nr_node->which].neighbour == nr_neigh)
if (nr_node->which < nr_node->count &&
nr_node->routes[nr_node->which].neighbour == nr_neigh)
nr_node->which++;
nr_node_unlock(nr_node);
}
spin_unlock_bh(&nr_node_list_lock);
nr_neigh_put(nr_neigh);
}
Expand Down

0 comments on commit 4ff6b01

Please sign in to comment.