diff options
| author | David S. Miller <davem@davemloft.net> | 2012-11-16 18:42:43 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-16 18:42:43 +0100 |
| commit | 545b29019c8959c805abfe8194d47e989f1a6e5f (patch) | |
| tree | 120f88abf0b4b2317072579c667fddfccb930fe5 /net/ipv4 | |
| parent | ipv6: export IP6_RT_PRIO_* to userland (diff) | |
| parent | netfilter: ipv6: only provide sk_bound_dev_if for link-local addr (diff) | |
| download | linux-545b29019c8959c805abfe8194d47e989f1a6e5f.tar.xz linux-545b29019c8959c805abfe8194d47e989f1a6e5f.zip | |
Merge branch 'master' of git://1984.lsi.us.es/nf-next
Conflicts:
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
Minor conflict due to some IS_ENABLED conversions done
in net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/netfilter/iptable_nat.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv4/netfilter/iptable_nat.c b/net/ipv4/netfilter/iptable_nat.c index a82047282dbb..ac635a7b4416 100644 --- a/net/ipv4/netfilter/iptable_nat.c +++ b/net/ipv4/netfilter/iptable_nat.c @@ -276,9 +276,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) |