diff options
| author | YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org> | 2013-01-22 06:32:54 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-01-22 14:28:28 -0500 |
| commit | 3f0d2ba0bd7d7dc7b461bc7d2cd3c297b843a3a8 (patch) | |
| tree | 2fa727659cc6f2c6326d1ad0ca3fdf45f27ebd04 | |
| parent | 50c3a487d507568359ccbce1b15bcdfc01edf7ef (diff) | |
| download | linux-3.10-3f0d2ba0bd7d7dc7b461bc7d2cd3c297b843a3a8.tar.gz linux-3.10-3f0d2ba0bd7d7dc7b461bc7d2cd3c297b843a3a8.tar.bz2 linux-3.10-3f0d2ba0bd7d7dc7b461bc7d2cd3c297b843a3a8.zip | |
ipv6: Use IS_ERR_OR_NULL().
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv6/addrconf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 420e5632638..80d59802d96 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; } |