git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
net
/
netrom
/
nr_route.c
diff --git
a/net/netrom/nr_route.c
b/net/netrom/nr_route.c
index
c11737f
..
b3b9097
100644
(file)
--- a/
net/netrom/nr_route.c
+++ b/
net/netrom/nr_route.c
@@
-725,17
+725,15
@@
void nr_link_failed(ax25_cb *ax25, int reason)
struct nr_node *nr_node = NULL;
spin_lock_bh(&nr_neigh_list_lock);
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;
}
if (s->ax25 == ax25) {
nr_neigh_hold(s);
nr_neigh = s;
break;
}
- }
spin_unlock_bh(&nr_neigh_list_lock);
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);
nr_neigh->ax25 = NULL;
ax25_cb_put(ax25);
@@
-745,13
+743,11
@@
void nr_link_failed(ax25_cb *ax25, int reason)
return;
}
spin_lock_bh(&nr_node_list_lock);
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);
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);
nr_node->which++;
nr_node_unlock(nr_node);
- }
spin_unlock_bh(&nr_node_list_lock);
nr_neigh_put(nr_neigh);
}
spin_unlock_bh(&nr_node_list_lock);
nr_neigh_put(nr_neigh);
}