diff for duplicates of <20120729004550.GA7049@localhost> diff --git a/a/1.txt b/N1/1.txt index edb1c6d..a3ae4db 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -54,7 +54,8 @@ Signed-off-by: Fengguang Wu <fengguang.wu@intel.com> --- linux.orig/net/ipv4/netfilter/iptable_filter.c 2012-07-29 08:41:09.523759531 +0800 +++ linux/net/ipv4/netfilter/iptable_filter.c 2012-07-29 08:41:14.259759643 +0800 @@ -69,9 +69,7 @@ static int __net_init iptable_filter_net - net->ipv4.iptable_filter ipt_register_table(net, &packet_filter, repl); + net->ipv4.iptable_filter = + ipt_register_table(net, &packet_filter, repl); kfree(repl); - if (IS_ERR(net->ipv4.iptable_filter)) - return PTR_ERR(net->ipv4.iptable_filter); @@ -66,7 +67,8 @@ Signed-off-by: Fengguang Wu <fengguang.wu@intel.com> --- linux.orig/net/ipv4/netfilter/iptable_mangle.c 2012-07-29 08:41:09.495759530 +0800 +++ linux/net/ipv4/netfilter/iptable_mangle.c 2012-07-29 08:41:14.259759643 +0800 @@ -104,9 +104,7 @@ static int __net_init iptable_mangle_net - net->ipv4.iptable_mangle ipt_register_table(net, &packet_mangler, repl); + net->ipv4.iptable_mangle = + ipt_register_table(net, &packet_mangler, repl); kfree(repl); - if (IS_ERR(net->ipv4.iptable_mangle)) - return PTR_ERR(net->ipv4.iptable_mangle); @@ -78,7 +80,8 @@ Signed-off-by: Fengguang Wu <fengguang.wu@intel.com> --- linux.orig/net/ipv4/netfilter/iptable_raw.c 2012-07-29 08:41:09.467759529 +0800 +++ linux/net/ipv4/netfilter/iptable_raw.c 2012-07-29 08:41:14.259759643 +0800 @@ -48,9 +48,7 @@ static int __net_init iptable_raw_net_in - net->ipv4.iptable_raw ipt_register_table(net, &packet_raw, repl); + net->ipv4.iptable_raw = + ipt_register_table(net, &packet_raw, repl); kfree(repl); - if (IS_ERR(net->ipv4.iptable_raw)) - return PTR_ERR(net->ipv4.iptable_raw); @@ -90,7 +93,8 @@ Signed-off-by: Fengguang Wu <fengguang.wu@intel.com> --- linux.orig/net/ipv4/netfilter/iptable_security.c 2012-07-29 08:41:09.439759529 +0800 +++ linux/net/ipv4/netfilter/iptable_security.c 2012-07-29 08:41:14.259759643 +0800 @@ -66,10 +66,7 @@ static int __net_init iptable_security_n - net->ipv4.iptable_security ipt_register_table(net, &security_table, repl); + net->ipv4.iptable_security = + ipt_register_table(net, &security_table, repl); kfree(repl); - if (IS_ERR(net->ipv4.iptable_security)) - return PTR_ERR(net->ipv4.iptable_security); @@ -103,7 +107,8 @@ Signed-off-by: Fengguang Wu <fengguang.wu@intel.com> --- linux.orig/net/ipv6/netfilter/ip6table_filter.c 2012-07-29 08:41:09.643759533 +0800 +++ linux/net/ipv6/netfilter/ip6table_filter.c 2012-07-29 08:41:14.259759643 +0800 @@ -61,9 +61,7 @@ static int __net_init ip6table_filter_ne - net->ipv6.ip6table_filter ip6t_register_table(net, &packet_filter, repl); + net->ipv6.ip6table_filter = + ip6t_register_table(net, &packet_filter, repl); kfree(repl); - if (IS_ERR(net->ipv6.ip6table_filter)) - return PTR_ERR(net->ipv6.ip6table_filter); @@ -115,7 +120,8 @@ Signed-off-by: Fengguang Wu <fengguang.wu@intel.com> --- linux.orig/net/ipv6/netfilter/ip6table_mangle.c 2012-07-29 08:41:09.615759532 +0800 +++ linux/net/ipv6/netfilter/ip6table_mangle.c 2012-07-29 08:41:14.259759643 +0800 @@ -97,9 +97,7 @@ static int __net_init ip6table_mangle_ne - net->ipv6.ip6table_mangle ip6t_register_table(net, &packet_mangler, repl); + net->ipv6.ip6table_mangle = + ip6t_register_table(net, &packet_mangler, repl); kfree(repl); - if (IS_ERR(net->ipv6.ip6table_mangle)) - return PTR_ERR(net->ipv6.ip6table_mangle); @@ -127,7 +133,8 @@ Signed-off-by: Fengguang Wu <fengguang.wu@intel.com> --- linux.orig/net/ipv6/netfilter/ip6table_raw.c 2012-07-29 08:41:09.583759532 +0800 +++ linux/net/ipv6/netfilter/ip6table_raw.c 2012-07-29 08:41:14.259759643 +0800 @@ -40,9 +40,7 @@ static int __net_init ip6table_raw_net_i - net->ipv6.ip6table_raw ip6t_register_table(net, &packet_raw, repl); + net->ipv6.ip6table_raw = + ip6t_register_table(net, &packet_raw, repl); kfree(repl); - if (IS_ERR(net->ipv6.ip6table_raw)) - return PTR_ERR(net->ipv6.ip6table_raw); @@ -139,7 +146,8 @@ Signed-off-by: Fengguang Wu <fengguang.wu@intel.com> --- linux.orig/net/ipv6/netfilter/ip6table_security.c 2012-07-29 08:41:09.555759531 +0800 +++ linux/net/ipv6/netfilter/ip6table_security.c 2012-07-29 08:41:14.259759643 +0800 @@ -58,10 +58,7 @@ static int __net_init ip6table_security_ - net->ipv6.ip6table_security ip6t_register_table(net, &security_table, repl); + net->ipv6.ip6table_security = + ip6t_register_table(net, &security_table, repl); kfree(repl); - if (IS_ERR(net->ipv6.ip6table_security)) - return PTR_ERR(net->ipv6.ip6table_security); diff --git a/a/content_digest b/N1/content_digest index 70f74da..85a2753 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Fengguang Wu <fengguang.wu@intel.com>\0" "Subject\0[PATCH] netfilter: PTR_RET can be used\0" - "Date\0Sun, 29 Jul 2012 00:45:50 +0000\0" + "Date\0Sun, 29 Jul 2012 08:45:50 +0800\0" "To\0Pablo Neira Ayuso <pablo@netfilter.org>\0" "Cc\0netfilter-devel@vger.kernel.org" kernel-janitors@vger.kernel.org @@ -63,7 +63,8 @@ "--- linux.orig/net/ipv4/netfilter/iptable_filter.c\t2012-07-29 08:41:09.523759531 +0800\n" "+++ linux/net/ipv4/netfilter/iptable_filter.c\t2012-07-29 08:41:14.259759643 +0800\n" "@@ -69,9 +69,7 @@ static int __net_init iptable_filter_net\n" - " \tnet->ipv4.iptable_filter \t\tipt_register_table(net, &packet_filter, repl);\n" + " \tnet->ipv4.iptable_filter =\n" + " \t\tipt_register_table(net, &packet_filter, repl);\n" " \tkfree(repl);\n" "-\tif (IS_ERR(net->ipv4.iptable_filter))\n" "-\t\treturn PTR_ERR(net->ipv4.iptable_filter);\n" @@ -75,7 +76,8 @@ "--- linux.orig/net/ipv4/netfilter/iptable_mangle.c\t2012-07-29 08:41:09.495759530 +0800\n" "+++ linux/net/ipv4/netfilter/iptable_mangle.c\t2012-07-29 08:41:14.259759643 +0800\n" "@@ -104,9 +104,7 @@ static int __net_init iptable_mangle_net\n" - " \tnet->ipv4.iptable_mangle \t\tipt_register_table(net, &packet_mangler, repl);\n" + " \tnet->ipv4.iptable_mangle =\n" + " \t\tipt_register_table(net, &packet_mangler, repl);\n" " \tkfree(repl);\n" "-\tif (IS_ERR(net->ipv4.iptable_mangle))\n" "-\t\treturn PTR_ERR(net->ipv4.iptable_mangle);\n" @@ -87,7 +89,8 @@ "--- linux.orig/net/ipv4/netfilter/iptable_raw.c\t2012-07-29 08:41:09.467759529 +0800\n" "+++ linux/net/ipv4/netfilter/iptable_raw.c\t2012-07-29 08:41:14.259759643 +0800\n" "@@ -48,9 +48,7 @@ static int __net_init iptable_raw_net_in\n" - " \tnet->ipv4.iptable_raw \t\tipt_register_table(net, &packet_raw, repl);\n" + " \tnet->ipv4.iptable_raw =\n" + " \t\tipt_register_table(net, &packet_raw, repl);\n" " \tkfree(repl);\n" "-\tif (IS_ERR(net->ipv4.iptable_raw))\n" "-\t\treturn PTR_ERR(net->ipv4.iptable_raw);\n" @@ -99,7 +102,8 @@ "--- linux.orig/net/ipv4/netfilter/iptable_security.c\t2012-07-29 08:41:09.439759529 +0800\n" "+++ linux/net/ipv4/netfilter/iptable_security.c\t2012-07-29 08:41:14.259759643 +0800\n" "@@ -66,10 +66,7 @@ static int __net_init iptable_security_n\n" - " \tnet->ipv4.iptable_security \t\tipt_register_table(net, &security_table, repl);\n" + " \tnet->ipv4.iptable_security =\n" + " \t\tipt_register_table(net, &security_table, repl);\n" " \tkfree(repl);\n" "-\tif (IS_ERR(net->ipv4.iptable_security))\n" "-\t\treturn PTR_ERR(net->ipv4.iptable_security);\n" @@ -112,7 +116,8 @@ "--- linux.orig/net/ipv6/netfilter/ip6table_filter.c\t2012-07-29 08:41:09.643759533 +0800\n" "+++ linux/net/ipv6/netfilter/ip6table_filter.c\t2012-07-29 08:41:14.259759643 +0800\n" "@@ -61,9 +61,7 @@ static int __net_init ip6table_filter_ne\n" - " \tnet->ipv6.ip6table_filter \t\tip6t_register_table(net, &packet_filter, repl);\n" + " \tnet->ipv6.ip6table_filter =\n" + " \t\tip6t_register_table(net, &packet_filter, repl);\n" " \tkfree(repl);\n" "-\tif (IS_ERR(net->ipv6.ip6table_filter))\n" "-\t\treturn PTR_ERR(net->ipv6.ip6table_filter);\n" @@ -124,7 +129,8 @@ "--- linux.orig/net/ipv6/netfilter/ip6table_mangle.c\t2012-07-29 08:41:09.615759532 +0800\n" "+++ linux/net/ipv6/netfilter/ip6table_mangle.c\t2012-07-29 08:41:14.259759643 +0800\n" "@@ -97,9 +97,7 @@ static int __net_init ip6table_mangle_ne\n" - " \tnet->ipv6.ip6table_mangle \t\tip6t_register_table(net, &packet_mangler, repl);\n" + " \tnet->ipv6.ip6table_mangle =\n" + " \t\tip6t_register_table(net, &packet_mangler, repl);\n" " \tkfree(repl);\n" "-\tif (IS_ERR(net->ipv6.ip6table_mangle))\n" "-\t\treturn PTR_ERR(net->ipv6.ip6table_mangle);\n" @@ -136,7 +142,8 @@ "--- linux.orig/net/ipv6/netfilter/ip6table_raw.c\t2012-07-29 08:41:09.583759532 +0800\n" "+++ linux/net/ipv6/netfilter/ip6table_raw.c\t2012-07-29 08:41:14.259759643 +0800\n" "@@ -40,9 +40,7 @@ static int __net_init ip6table_raw_net_i\n" - " \tnet->ipv6.ip6table_raw \t\tip6t_register_table(net, &packet_raw, repl);\n" + " \tnet->ipv6.ip6table_raw =\n" + " \t\tip6t_register_table(net, &packet_raw, repl);\n" " \tkfree(repl);\n" "-\tif (IS_ERR(net->ipv6.ip6table_raw))\n" "-\t\treturn PTR_ERR(net->ipv6.ip6table_raw);\n" @@ -148,7 +155,8 @@ "--- linux.orig/net/ipv6/netfilter/ip6table_security.c\t2012-07-29 08:41:09.555759531 +0800\n" "+++ linux/net/ipv6/netfilter/ip6table_security.c\t2012-07-29 08:41:14.259759643 +0800\n" "@@ -58,10 +58,7 @@ static int __net_init ip6table_security_\n" - " \tnet->ipv6.ip6table_security \t\tip6t_register_table(net, &security_table, repl);\n" + " \tnet->ipv6.ip6table_security =\n" + " \t\tip6t_register_table(net, &security_table, repl);\n" " \tkfree(repl);\n" "-\tif (IS_ERR(net->ipv6.ip6table_security))\n" "-\t\treturn PTR_ERR(net->ipv6.ip6table_security);\n" @@ -159,4 +167,4 @@ " \n" static void __net_exit ip6table_security_net_exit(struct net *net) -4f60d2bbb54de6cee7e34288be458cfb16bb06a8f557263880552198fca2a5f0 +b21c52457ea0149f4e5cd1b4a3fdfa99b9d49260774095d8ecd92c94d8ea44ac
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.