diff options
Diffstat (limited to 'net/ax25/af_ax25.c')
-rw-r--r-- | net/ax25/af_ax25.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c index 69a06c47b648..7b11f8bc5071 100644 --- a/net/ax25/af_ax25.c +++ b/net/ax25/af_ax25.c | |||
@@ -81,14 +81,13 @@ static void ax25_kill_by_device(struct net_device *dev) | |||
81 | { | 81 | { |
82 | ax25_dev *ax25_dev; | 82 | ax25_dev *ax25_dev; |
83 | ax25_cb *s; | 83 | ax25_cb *s; |
84 | struct hlist_node *node; | ||
85 | 84 | ||
86 | if ((ax25_dev = ax25_dev_ax25dev(dev)) == NULL) | 85 | if ((ax25_dev = ax25_dev_ax25dev(dev)) == NULL) |
87 | return; | 86 | return; |
88 | 87 | ||
89 | spin_lock_bh(&ax25_list_lock); | 88 | spin_lock_bh(&ax25_list_lock); |
90 | again: | 89 | again: |
91 | ax25_for_each(s, node, &ax25_list) { | 90 | ax25_for_each(s, &ax25_list) { |
92 | if (s->ax25_dev == ax25_dev) { | 91 | if (s->ax25_dev == ax25_dev) { |
93 | s->ax25_dev = NULL; | 92 | s->ax25_dev = NULL; |
94 | spin_unlock_bh(&ax25_list_lock); | 93 | spin_unlock_bh(&ax25_list_lock); |
@@ -158,10 +157,9 @@ struct sock *ax25_find_listener(ax25_address *addr, int digi, | |||
158 | struct net_device *dev, int type) | 157 | struct net_device *dev, int type) |
159 | { | 158 | { |
160 | ax25_cb *s; | 159 | ax25_cb *s; |
161 | struct hlist_node *node; | ||
162 | 160 | ||
163 | spin_lock(&ax25_list_lock); | 161 | spin_lock(&ax25_list_lock); |
164 | ax25_for_each(s, node, &ax25_list) { | 162 | ax25_for_each(s, &ax25_list) { |
165 | if ((s->iamdigi && !digi) || (!s->iamdigi && digi)) | 163 | if ((s->iamdigi && !digi) || (!s->iamdigi && digi)) |
166 | continue; | 164 | continue; |
167 | if (s->sk && !ax25cmp(&s->source_addr, addr) && | 165 | if (s->sk && !ax25cmp(&s->source_addr, addr) && |
@@ -187,10 +185,9 @@ struct sock *ax25_get_socket(ax25_address *my_addr, ax25_address *dest_addr, | |||
187 | { | 185 | { |
188 | struct sock *sk = NULL; | 186 | struct sock *sk = NULL; |
189 | ax25_cb *s; | 187 | ax25_cb *s; |
190 | struct hlist_node *node; | ||
191 | 188 | ||
192 | spin_lock(&ax25_list_lock); | 189 | spin_lock(&ax25_list_lock); |
193 | ax25_for_each(s, node, &ax25_list) { | 190 | ax25_for_each(s, &ax25_list) { |
194 | if (s->sk && !ax25cmp(&s->source_addr, my_addr) && | 191 | if (s->sk && !ax25cmp(&s->source_addr, my_addr) && |
195 | !ax25cmp(&s->dest_addr, dest_addr) && | 192 | !ax25cmp(&s->dest_addr, dest_addr) && |
196 | s->sk->sk_type == type) { | 193 | s->sk->sk_type == type) { |
@@ -213,10 +210,9 @@ ax25_cb *ax25_find_cb(ax25_address *src_addr, ax25_address *dest_addr, | |||
213 | ax25_digi *digi, struct net_device *dev) | 210 | ax25_digi *digi, struct net_device *dev) |
214 | { | 211 | { |
215 | ax25_cb *s; | 212 | ax25_cb *s; |
216 | struct hlist_node *node; | ||
217 | 213 | ||
218 | spin_lock_bh(&ax25_list_lock); | 214 | spin_lock_bh(&ax25_list_lock); |
219 | ax25_for_each(s, node, &ax25_list) { | 215 | ax25_for_each(s, &ax25_list) { |
220 | if (s->sk && s->sk->sk_type != SOCK_SEQPACKET) | 216 | if (s->sk && s->sk->sk_type != SOCK_SEQPACKET) |
221 | continue; | 217 | continue; |
222 | if (s->ax25_dev == NULL) | 218 | if (s->ax25_dev == NULL) |
@@ -248,10 +244,9 @@ void ax25_send_to_raw(ax25_address *addr, struct sk_buff *skb, int proto) | |||
248 | { | 244 | { |
249 | ax25_cb *s; | 245 | ax25_cb *s; |
250 | struct sk_buff *copy; | 246 | struct sk_buff *copy; |
251 | struct hlist_node *node; | ||
252 | 247 | ||
253 | spin_lock(&ax25_list_lock); | 248 | spin_lock(&ax25_list_lock); |
254 | ax25_for_each(s, node, &ax25_list) { | 249 | ax25_for_each(s, &ax25_list) { |
255 | if (s->sk != NULL && ax25cmp(&s->source_addr, addr) == 0 && | 250 | if (s->sk != NULL && ax25cmp(&s->source_addr, addr) == 0 && |
256 | s->sk->sk_type == SOCK_RAW && | 251 | s->sk->sk_type == SOCK_RAW && |
257 | s->sk->sk_protocol == proto && | 252 | s->sk->sk_protocol == proto && |