OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 9... Line 9...
9 Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> 9 Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
10 --- 10 ---
Line 11... Line 11...
11   11  
12 --- a/net/ipv4/netfilter/ipt_CLUSTERIP.c 12 --- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
13 +++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c 13 +++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
14 @@ -835,6 +835,7 @@ static void clusterip_net_exit(struct ne 14 @@ -834,6 +834,7 @@ static void clusterip_net_exit(struct ne
15 cn->procdir = NULL; 15 cn->procdir = NULL;
16 #endif 16 #endif
17 nf_unregister_net_hook(net, &cip_arp_ops); 17 nf_unregister_net_hook(net, &cip_arp_ops);
18 + WARN_ON_ONCE(!list_empty(&cn->configs)); 18 + WARN_ON_ONCE(!list_empty(&cn->configs));
Line 19... Line 19...
19 } 19 }
20 20
21 static struct pernet_operations clusterip_net_ops = { 21 static struct pernet_operations clusterip_net_ops = {
22 --- a/net/netfilter/nf_tables_api.c 22 --- a/net/netfilter/nf_tables_api.c
23 +++ b/net/netfilter/nf_tables_api.c 23 +++ b/net/netfilter/nf_tables_api.c
24 @@ -6539,6 +6539,12 @@ static int __net_init nf_tables_init_net 24 @@ -6523,6 +6523,12 @@ static int __net_init nf_tables_init_net
Line 25... Line 25...
25 return 0; 25 return 0;
26 } 26 }
Line 32... Line 32...
32 +} 32 +}
33 + 33 +
34 int __nft_release_basechain(struct nft_ctx *ctx) 34 int __nft_release_basechain(struct nft_ctx *ctx)
35 { 35 {
36 struct nft_rule *rule, *nr; 36 struct nft_rule *rule, *nr;
37 @@ -6616,6 +6622,7 @@ static void __nft_release_afinfo(struct 37 @@ -6600,6 +6606,7 @@ static void __nft_release_afinfo(struct
Line 38... Line 38...
38 38
39 static struct pernet_operations nf_tables_net_ops = { 39 static struct pernet_operations nf_tables_net_ops = {
40 .init = nf_tables_init_net, 40 .init = nf_tables_init_net,
41 + .exit = nf_tables_exit_net, 41 + .exit = nf_tables_exit_net,
Line 60... Line 60...
60 } 60 }
Line 61... Line 61...
61 61
62 static struct pernet_operations nfnl_log_net_ops = { 62 static struct pernet_operations nfnl_log_net_ops = {
63 --- a/net/netfilter/nfnetlink_queue.c 63 --- a/net/netfilter/nfnetlink_queue.c
64 +++ b/net/netfilter/nfnetlink_queue.c 64 +++ b/net/netfilter/nfnetlink_queue.c
Line 65... Line 65...
65 @@ -1510,10 +1510,15 @@ static int __net_init nfnl_queue_net_ini 65 @@ -1515,10 +1515,15 @@ static int __net_init nfnl_queue_net_ini
66 66
67 static void __net_exit nfnl_queue_net_exit(struct net *net) 67 static void __net_exit nfnl_queue_net_exit(struct net *net)
68 { 68 {