Merge tag 'for-linus-v3.9-rc4' of git://oss.sgi.com/xfs/xfs

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / ieee802154 / dgram.c

diff --git a/net/ieee802154/dgram.c b/net/ieee802154/dgram.c
index 16705611589ab6abd1a2e67811d0e38d6d8b4d26..e0da175f8e5b7962b7906531ebee6e0650bf7a73 100644 (file)
--- 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,
 int ieee802154_dgram_deliver(struct net_device *dev, struct sk_buff *skb)
 {
        struct sock *sk, *prev = NULL;
-       struct hlist_node *node;
        int ret = NET_RX_SUCCESS;
        u16 pan_id, short_addr;
 
@@ -361,7 +360,7 @@ int ieee802154_dgram_deliver(struct net_device *dev, struct sk_buff *skb)
        short_addr = ieee802154_mlme_ops(dev)->get_short_addr(dev);
 
        read_lock(&dgram_lock);
-       sk_for_each(sk, node, &dgram_head) {
+       sk_for_each(sk, &dgram_head) {
                if (ieee802154_match_sock(dev->dev_addr, pan_id, short_addr,
                                        dgram_sk(sk))) {
                        if (prev) {