hlist: drop the node parameter from iterators

[linux-2.6-block.git] / net / netrom / af_netrom.c

diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index 297b07a029de13b41b40e322cd9b4729bfee64b1..d1fa1d9ffd2e82450d1a6c73fbfb55419cebe0c5 100644 (file)
--- a/net/netrom/af_netrom.c
+++ b/net/netrom/af_netrom.c
@@ -104,10 +104,9 @@ static void nr_remove_socket(struct sock *sk)
 static void nr_kill_by_device(struct net_device *dev)
 {
        struct sock *s;
-       struct hlist_node *node;
 
        spin_lock_bh(&nr_list_lock);
-       sk_for_each(s, node, &nr_list)
+       sk_for_each(s, &nr_list)
                if (nr_sk(s)->device == dev)
                        nr_disconnect(s, ENETUNREACH);
        spin_unlock_bh(&nr_list_lock);
@@ -149,10 +148,9 @@ static void nr_insert_socket(struct sock *sk)
 static struct sock *nr_find_listener(ax25_address *addr)
 {
        struct sock *s;
-       struct hlist_node *node;
 
        spin_lock_bh(&nr_list_lock);
-       sk_for_each(s, node, &nr_list)
+       sk_for_each(s, &nr_list)
                if (!ax25cmp(&nr_sk(s)->source_addr, addr) &&
                    s->sk_state == TCP_LISTEN) {
                        bh_lock_sock(s);
@@ -170,10 +168,9 @@ found:
 static struct sock *nr_find_socket(unsigned char index, unsigned char id)
 {
        struct sock *s;
-       struct hlist_node *node;
 
        spin_lock_bh(&nr_list_lock);
-       sk_for_each(s, node, &nr_list) {
+       sk_for_each(s, &nr_list) {
                struct nr_sock *nr = nr_sk(s);
 
                if (nr->my_index == index && nr->my_id == id) {
@@ -194,10 +191,9 @@ static struct sock *nr_find_peer(unsigned char index, unsigned char id,
        ax25_address *dest)
 {
        struct sock *s;
-       struct hlist_node *node;
 
        spin_lock_bh(&nr_list_lock);
-       sk_for_each(s, node, &nr_list) {
+       sk_for_each(s, &nr_list) {
                struct nr_sock *nr = nr_sk(s);
 
                if (nr->your_index == index && nr->your_id == id &&