diff options
-rw-r--r-- | net/netfilter/nf_conntrack_core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index 565c3a86423f..b37109817a98 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c | |||
@@ -1089,14 +1089,14 @@ void nf_conntrack_flush_report(struct net *net, u32 pid, int report) | |||
1089 | } | 1089 | } |
1090 | EXPORT_SYMBOL_GPL(nf_conntrack_flush_report); | 1090 | EXPORT_SYMBOL_GPL(nf_conntrack_flush_report); |
1091 | 1091 | ||
1092 | static void nf_ct_release_dying_list(void) | 1092 | static void nf_ct_release_dying_list(struct net *net) |
1093 | { | 1093 | { |
1094 | struct nf_conntrack_tuple_hash *h; | 1094 | struct nf_conntrack_tuple_hash *h; |
1095 | struct nf_conn *ct; | 1095 | struct nf_conn *ct; |
1096 | struct hlist_nulls_node *n; | 1096 | struct hlist_nulls_node *n; |
1097 | 1097 | ||
1098 | spin_lock_bh(&nf_conntrack_lock); | 1098 | spin_lock_bh(&nf_conntrack_lock); |
1099 | hlist_nulls_for_each_entry(h, n, &init_net.ct.dying, hnnode) { | 1099 | hlist_nulls_for_each_entry(h, n, &net->ct.dying, hnnode) { |
1100 | ct = nf_ct_tuplehash_to_ctrack(h); | 1100 | ct = nf_ct_tuplehash_to_ctrack(h); |
1101 | /* never fails to remove them, no listeners at this point */ | 1101 | /* never fails to remove them, no listeners at this point */ |
1102 | nf_ct_kill(ct); | 1102 | nf_ct_kill(ct); |
@@ -1115,7 +1115,7 @@ static void nf_conntrack_cleanup_net(struct net *net) | |||
1115 | { | 1115 | { |
1116 | i_see_dead_people: | 1116 | i_see_dead_people: |
1117 | nf_ct_iterate_cleanup(net, kill_all, NULL); | 1117 | nf_ct_iterate_cleanup(net, kill_all, NULL); |
1118 | nf_ct_release_dying_list(); | 1118 | nf_ct_release_dying_list(net); |
1119 | if (atomic_read(&net->ct.count) != 0) { | 1119 | if (atomic_read(&net->ct.count) != 0) { |
1120 | schedule(); | 1120 | schedule(); |
1121 | goto i_see_dead_people; | 1121 | goto i_see_dead_people; |