diff for duplicates of <5015280A.6000105@bfs.de> diff --git a/a/1.txt b/N1/1.txt index 39faee9..e8957cc 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -67,7 +67,8 @@ re, > --- 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); @@ -79,7 +80,8 @@ re, > --- 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); @@ -91,7 +93,8 @@ re, > --- 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); @@ -103,7 +106,8 @@ re, > --- 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); @@ -116,7 +120,8 @@ re, > --- 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); @@ -128,7 +133,8 @@ re, > --- 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); @@ -140,7 +146,8 @@ re, > --- 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); @@ -152,7 +159,8 @@ re, > --- 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 fd6fc2c..1755488 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020120729004550.GA7049@localhost\0" "From\0walter harms <wharms@bfs.de>\0" "Subject\0Re: [PATCH] netfilter: PTR_RET can be used\0" - "Date\0Sun, 29 Jul 2012 12:09:46 +0000\0" + "Date\0Sun, 29 Jul 2012 14:09:46 +0200\0" "To\0Fengguang Wu <fengguang.wu@intel.com>\0" "Cc\0Pablo Neira Ayuso <pablo@netfilter.org>" netfilter-devel@vger.kernel.org @@ -78,7 +78,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" @@ -90,7 +91,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" @@ -102,7 +104,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" @@ -114,7 +117,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" @@ -127,7 +131,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" @@ -139,7 +144,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" @@ -151,7 +157,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" @@ -163,7 +170,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" @@ -180,4 +188,4 @@ "> \n" > -3e41651166142a6752ac8b6c93c66fa8886eeb305568affb6cf068b0e5bd36f5 +b9afcd8a8504de414c16018e1a6680191c6e9725cdf83339542b47601073d858
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.