diff options
Diffstat (limited to 'net/decnet/dn_table.c')
-rw-r--r-- | net/decnet/dn_table.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/net/decnet/dn_table.c b/net/decnet/dn_table.c index f968c1b58f47..6c2445bcaba1 100644 --- a/net/decnet/dn_table.c +++ b/net/decnet/dn_table.c | |||
@@ -483,7 +483,6 @@ int dn_fib_dump(struct sk_buff *skb, struct netlink_callback *cb) | |||
483 | unsigned int h, s_h; | 483 | unsigned int h, s_h; |
484 | unsigned int e = 0, s_e; | 484 | unsigned int e = 0, s_e; |
485 | struct dn_fib_table *tb; | 485 | struct dn_fib_table *tb; |
486 | struct hlist_node *node; | ||
487 | int dumped = 0; | 486 | int dumped = 0; |
488 | 487 | ||
489 | if (!net_eq(net, &init_net)) | 488 | if (!net_eq(net, &init_net)) |
@@ -498,7 +497,7 @@ int dn_fib_dump(struct sk_buff *skb, struct netlink_callback *cb) | |||
498 | 497 | ||
499 | for (h = s_h; h < DN_FIB_TABLE_HASHSZ; h++, s_h = 0) { | 498 | for (h = s_h; h < DN_FIB_TABLE_HASHSZ; h++, s_h = 0) { |
500 | e = 0; | 499 | e = 0; |
501 | hlist_for_each_entry(tb, node, &dn_fib_table_hash[h], hlist) { | 500 | hlist_for_each_entry(tb, &dn_fib_table_hash[h], hlist) { |
502 | if (e < s_e) | 501 | if (e < s_e) |
503 | goto next; | 502 | goto next; |
504 | if (dumped) | 503 | if (dumped) |
@@ -828,7 +827,6 @@ out: | |||
828 | struct dn_fib_table *dn_fib_get_table(u32 n, int create) | 827 | struct dn_fib_table *dn_fib_get_table(u32 n, int create) |
829 | { | 828 | { |
830 | struct dn_fib_table *t; | 829 | struct dn_fib_table *t; |
831 | struct hlist_node *node; | ||
832 | unsigned int h; | 830 | unsigned int h; |
833 | 831 | ||
834 | if (n < RT_TABLE_MIN) | 832 | if (n < RT_TABLE_MIN) |
@@ -839,7 +837,7 @@ struct dn_fib_table *dn_fib_get_table(u32 n, int create) | |||
839 | 837 | ||
840 | h = n & (DN_FIB_TABLE_HASHSZ - 1); | 838 | h = n & (DN_FIB_TABLE_HASHSZ - 1); |
841 | rcu_read_lock(); | 839 | rcu_read_lock(); |
842 | hlist_for_each_entry_rcu(t, node, &dn_fib_table_hash[h], hlist) { | 840 | hlist_for_each_entry_rcu(t, &dn_fib_table_hash[h], hlist) { |
843 | if (t->n == n) { | 841 | if (t->n == n) { |
844 | rcu_read_unlock(); | 842 | rcu_read_unlock(); |
845 | return t; | 843 | return t; |
@@ -885,11 +883,10 @@ void dn_fib_flush(void) | |||
885 | { | 883 | { |
886 | int flushed = 0; | 884 | int flushed = 0; |
887 | struct dn_fib_table *tb; | 885 | struct dn_fib_table *tb; |
888 | struct hlist_node *node; | ||
889 | unsigned int h; | 886 | unsigned int h; |
890 | 887 | ||
891 | for (h = 0; h < DN_FIB_TABLE_HASHSZ; h++) { | 888 | for (h = 0; h < DN_FIB_TABLE_HASHSZ; h++) { |
892 | hlist_for_each_entry(tb, node, &dn_fib_table_hash[h], hlist) | 889 | hlist_for_each_entry(tb, &dn_fib_table_hash[h], hlist) |
893 | flushed += tb->flush(tb); | 890 | flushed += tb->flush(tb); |
894 | } | 891 | } |
895 | 892 | ||
@@ -908,12 +905,12 @@ void __init dn_fib_table_init(void) | |||
908 | void __exit dn_fib_table_cleanup(void) | 905 | void __exit dn_fib_table_cleanup(void) |
909 | { | 906 | { |
910 | struct dn_fib_table *t; | 907 | struct dn_fib_table *t; |
911 | struct hlist_node *node, *next; | 908 | struct hlist_node *next; |
912 | unsigned int h; | 909 | unsigned int h; |
913 | 910 | ||
914 | write_lock(&dn_fib_tables_lock); | 911 | write_lock(&dn_fib_tables_lock); |
915 | for (h = 0; h < DN_FIB_TABLE_HASHSZ; h++) { | 912 | for (h = 0; h < DN_FIB_TABLE_HASHSZ; h++) { |
916 | hlist_for_each_entry_safe(t, node, next, &dn_fib_table_hash[h], | 913 | hlist_for_each_entry_safe(t, next, &dn_fib_table_hash[h], |
917 | hlist) { | 914 | hlist) { |
918 | hlist_del(&t->hlist); | 915 | hlist_del(&t->hlist); |
919 | kfree(t); | 916 | kfree(t); |