Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6229b75d authored by Wu Fengguang's avatar Wu Fengguang Committed by Pablo Neira Ayuso
Browse files

netfilter: nf_nat: use PTR_RET 



Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR

Generated by: coccinelle/api/ptr_ret.cocci

Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Signed-off-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 05b4b065

net/ipv4/netfilter/iptable_nat.c

+1 −3
Original line number Diff line number Diff line
@@ -274,9 +274,7 @@ static int __net_init iptable_nat_net_init(struct net *net) 
		return -ENOMEM;

	net->ipv4.nat_table = ipt_register_table(net, &nf_nat_ipv4_table, repl);

	kfree(repl);

	if (IS_ERR(net->ipv4.nat_table))

		return PTR_ERR(net->ipv4.nat_table);

	return 0;

	return PTR_RET(net->ipv4.nat_table);

}



static void __net_exit iptable_nat_net_exit(struct net *net)

net/ipv6/netfilter/ip6table_nat.c

+1 −3
Original line number Diff line number Diff line
@@ -275,9 +275,7 @@ static int __net_init ip6table_nat_net_init(struct net *net) 
		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)