diff options
Diffstat (limited to 'net/ieee802154')
-rw-r--r-- | net/ieee802154/dgram.c | 3 | ||||
-rw-r--r-- | net/ieee802154/raw.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/net/ieee802154/dgram.c b/net/ieee802154/dgram.c index 16705611589a..e0da175f8e5b 100644 --- a/net/ieee802154/dgram.c +++ b/net/ieee802154/dgram.c | |||
@@ -350,7 +350,6 @@ static inline int ieee802154_match_sock(u8 *hw_addr, u16 pan_id, | |||
350 | int ieee802154_dgram_deliver(struct net_device *dev, struct sk_buff *skb) | 350 | int ieee802154_dgram_deliver(struct net_device *dev, struct sk_buff *skb) |
351 | { | 351 | { |
352 | struct sock *sk, *prev = NULL; | 352 | struct sock *sk, *prev = NULL; |
353 | struct hlist_node *node; | ||
354 | int ret = NET_RX_SUCCESS; | 353 | int ret = NET_RX_SUCCESS; |
355 | u16 pan_id, short_addr; | 354 | u16 pan_id, short_addr; |
356 | 355 | ||
@@ -361,7 +360,7 @@ int ieee802154_dgram_deliver(struct net_device *dev, struct sk_buff *skb) | |||
361 | short_addr = ieee802154_mlme_ops(dev)->get_short_addr(dev); | 360 | short_addr = ieee802154_mlme_ops(dev)->get_short_addr(dev); |
362 | 361 | ||
363 | read_lock(&dgram_lock); | 362 | read_lock(&dgram_lock); |
364 | sk_for_each(sk, node, &dgram_head) { | 363 | sk_for_each(sk, &dgram_head) { |
365 | if (ieee802154_match_sock(dev->dev_addr, pan_id, short_addr, | 364 | if (ieee802154_match_sock(dev->dev_addr, pan_id, short_addr, |
366 | dgram_sk(sk))) { | 365 | dgram_sk(sk))) { |
367 | if (prev) { | 366 | if (prev) { |
diff --git a/net/ieee802154/raw.c b/net/ieee802154/raw.c index 50e823927d49..41f538b8e59c 100644 --- a/net/ieee802154/raw.c +++ b/net/ieee802154/raw.c | |||
@@ -221,10 +221,9 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb) | |||
221 | void ieee802154_raw_deliver(struct net_device *dev, struct sk_buff *skb) | 221 | void ieee802154_raw_deliver(struct net_device *dev, struct sk_buff *skb) |
222 | { | 222 | { |
223 | struct sock *sk; | 223 | struct sock *sk; |
224 | struct hlist_node *node; | ||
225 | 224 | ||
226 | read_lock(&raw_lock); | 225 | read_lock(&raw_lock); |
227 | sk_for_each(sk, node, &raw_head) { | 226 | sk_for_each(sk, &raw_head) { |
228 | bh_lock_sock(sk); | 227 | bh_lock_sock(sk); |
229 | if (!sk->sk_bound_dev_if || | 228 | if (!sk->sk_bound_dev_if || |
230 | sk->sk_bound_dev_if == dev->ifindex) { | 229 | sk->sk_bound_dev_if == dev->ifindex) { |