Merge branch 'master' of git://1984.lsi.us.es/nf

[cascardo/linux.git] / net / ipv4 / raw.c

diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index 53ddebc..dd44e0a 100644 (file)
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -111,9 +111,7 @@ EXPORT_SYMBOL_GPL(raw_unhash_sk);
 static struct sock *__raw_v4_lookup(struct net *net, struct sock *sk,
                unsigned short num, __be32 raddr, __be32 laddr, int dif)
 {
-       struct hlist_node *node;
-
-       sk_for_each_from(sk, node) {
+       sk_for_each_from(sk) {
                struct inet_sock *inet = inet_sk(sk);
 
                if (net_eq(sock_net(sk), net) && inet->inet_num == num  &&
@@ -914,9 +912,7 @@ static struct sock *raw_get_first(struct seq_file *seq)
 
        for (state->bucket = 0; state->bucket < RAW_HTABLE_SIZE;
                        ++state->bucket) {
-               struct hlist_node *node;
-
-               sk_for_each(sk, node, &state->h->ht[state->bucket])
+               sk_for_each(sk, &state->h->ht[state->bucket])
                        if (sock_net(sk) == seq_file_net(seq))
                                goto found;
        }