Patchwork netfilter: ipv6: use PTR_RET

login
register
mail settings
Submitter Wu Fengguang
Date Oct. 29, 2012, 12:55 a.m.
Message ID <20121029005542.GA14313@localhost>
Download mbox | patch
Permalink /patch/194772/
State Accepted
Headers show

Comments

Wu Fengguang - Oct. 29, 2012, 12:55 a.m.
Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR

Generated by: coccinelle/api/ptr_ret.cocci

Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
---
 net/ipv6/netfilter/ip6table_nat.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

--- linux-next.orig/net/ipv6/netfilter/ip6table_nat.c	2012-10-23 09:44:52.637430993 +0800
+++ linux-next/net/ipv6/netfilter/ip6table_nat.c	2012-10-29 08:53:41.579243556 +0800
@@ -275,9 +275,7 @@  static int __net_init ip6table_nat_net_i
 		return -ENOMEM;
 	net->ipv6.ip6table_nat = ip6t_register_table(net, &nf_nat_ipv6_table, repl);
 	kfree(repl);
-	if (IS_ERR(net->ipv6.ip6table_nat))
-		return PTR_ERR(net->ipv6.ip6table_nat);
-	return 0;
+	return PTR_RET(net->ipv6.ip6table_nat);
 }
 
 static void __net_exit ip6table_nat_net_exit(struct net *net)