diff options
Diffstat (limited to 'net/x25/af_x25.c')
-rw-r--r-- | net/x25/af_x25.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index a306bc66000e..37ca9694aabe 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c | |||
@@ -208,11 +208,10 @@ static void x25_remove_socket(struct sock *sk) | |||
208 | static void x25_kill_by_device(struct net_device *dev) | 208 | static void x25_kill_by_device(struct net_device *dev) |
209 | { | 209 | { |
210 | struct sock *s; | 210 | struct sock *s; |
211 | struct hlist_node *node; | ||
212 | 211 | ||
213 | write_lock_bh(&x25_list_lock); | 212 | write_lock_bh(&x25_list_lock); |
214 | 213 | ||
215 | sk_for_each(s, node, &x25_list) | 214 | sk_for_each(s, &x25_list) |
216 | if (x25_sk(s)->neighbour && x25_sk(s)->neighbour->dev == dev) | 215 | if (x25_sk(s)->neighbour && x25_sk(s)->neighbour->dev == dev) |
217 | x25_disconnect(s, ENETUNREACH, 0, 0); | 216 | x25_disconnect(s, ENETUNREACH, 0, 0); |
218 | 217 | ||
@@ -280,12 +279,11 @@ static struct sock *x25_find_listener(struct x25_address *addr, | |||
280 | { | 279 | { |
281 | struct sock *s; | 280 | struct sock *s; |
282 | struct sock *next_best; | 281 | struct sock *next_best; |
283 | struct hlist_node *node; | ||
284 | 282 | ||
285 | read_lock_bh(&x25_list_lock); | 283 | read_lock_bh(&x25_list_lock); |
286 | next_best = NULL; | 284 | next_best = NULL; |
287 | 285 | ||
288 | sk_for_each(s, node, &x25_list) | 286 | sk_for_each(s, &x25_list) |
289 | if ((!strcmp(addr->x25_addr, | 287 | if ((!strcmp(addr->x25_addr, |
290 | x25_sk(s)->source_addr.x25_addr) || | 288 | x25_sk(s)->source_addr.x25_addr) || |
291 | !strcmp(addr->x25_addr, | 289 | !strcmp(addr->x25_addr, |
@@ -323,9 +321,8 @@ found: | |||
323 | static struct sock *__x25_find_socket(unsigned int lci, struct x25_neigh *nb) | 321 | static struct sock *__x25_find_socket(unsigned int lci, struct x25_neigh *nb) |
324 | { | 322 | { |
325 | struct sock *s; | 323 | struct sock *s; |
326 | struct hlist_node *node; | ||
327 | 324 | ||
328 | sk_for_each(s, node, &x25_list) | 325 | sk_for_each(s, &x25_list) |
329 | if (x25_sk(s)->lci == lci && x25_sk(s)->neighbour == nb) { | 326 | if (x25_sk(s)->lci == lci && x25_sk(s)->neighbour == nb) { |
330 | sock_hold(s); | 327 | sock_hold(s); |
331 | goto found; | 328 | goto found; |
@@ -1782,11 +1779,10 @@ static struct notifier_block x25_dev_notifier = { | |||
1782 | void x25_kill_by_neigh(struct x25_neigh *nb) | 1779 | void x25_kill_by_neigh(struct x25_neigh *nb) |
1783 | { | 1780 | { |
1784 | struct sock *s; | 1781 | struct sock *s; |
1785 | struct hlist_node *node; | ||
1786 | 1782 | ||
1787 | write_lock_bh(&x25_list_lock); | 1783 | write_lock_bh(&x25_list_lock); |
1788 | 1784 | ||
1789 | sk_for_each(s, node, &x25_list) | 1785 | sk_for_each(s, &x25_list) |
1790 | if (x25_sk(s)->neighbour == nb) | 1786 | if (x25_sk(s)->neighbour == nb) |
1791 | x25_disconnect(s, ENETUNREACH, 0, 0); | 1787 | x25_disconnect(s, ENETUNREACH, 0, 0); |
1792 | 1788 | ||