From patchwork Tue Jan 22 16:32:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [net-next,3/4] ipv6: Use IS_ERR_OR_NULL(). Date: Tue, 22 Jan 2013 06:32:54 -0000 From: =?utf-8?b?WU9TSElGVUpJIEhpZGVha2kgLyDlkInol6Toi7HmmI4gPHlvc2hmdWpp?= =?utf-8?q?=40linux-ipv6=2Eorg=3E?= X-Patchwork-Id: 214591 Message-Id: <50FEBF36.5060001@linux-ipv6.org> To: davem@davemloft.net, netdev@vger.kernel.org Cc: yoshfuji@linux-ipv6.org Signed-off-by: YOSHIFUJI Hideaki --- net/ipv6/addrconf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 420e563..80d5980 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -1051,7 +1051,7 @@ retry: ipv6_add_addr(idev, &addr, tmp_plen, ipv6_addr_type(&addr)&IPV6_ADDR_SCOPE_MASK, addr_flags) : NULL; - if (!ift || IS_ERR(ift)) { + if (IS_ERR_OR_NULL(ift)) { in6_ifa_put(ifp); in6_dev_put(idev); pr_info("%s: retry temporary address regeneration\n", __func__); @@ -2079,7 +2079,7 @@ ok: addr_type&IPV6_ADDR_SCOPE_MASK, addr_flags); - if (!ifp || IS_ERR(ifp)) { + if (IS_ERR_OR_NULL(ifp)) { in6_dev_put(in6_dev); return; }