diff options
author | YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org> | 2013-01-22 01:32:54 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-01-22 14:28:28 -0500 |
commit | 3f0d2ba0bd7d7dc7b461bc7d2cd3c297b843a3a8 (patch) | |
tree | 2fa727659cc6f2c6326d1ad0ca3fdf45f27ebd04 /net | |
parent | 50c3a487d507568359ccbce1b15bcdfc01edf7ef (diff) |
ipv6: Use IS_ERR_OR_NULL().
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '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 420e56326384..80d59802d964 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
@@ -1051,7 +1051,7 @@ retry: | |||
1051 | ipv6_add_addr(idev, &addr, tmp_plen, | 1051 | ipv6_add_addr(idev, &addr, tmp_plen, |
1052 | ipv6_addr_type(&addr)&IPV6_ADDR_SCOPE_MASK, | 1052 | ipv6_addr_type(&addr)&IPV6_ADDR_SCOPE_MASK, |
1053 | addr_flags) : NULL; | 1053 | addr_flags) : NULL; |
1054 | if (!ift || IS_ERR(ift)) { | 1054 | if (IS_ERR_OR_NULL(ift)) { |
1055 | in6_ifa_put(ifp); | 1055 | in6_ifa_put(ifp); |
1056 | in6_dev_put(idev); | 1056 | in6_dev_put(idev); |
1057 | pr_info("%s: retry temporary address regeneration\n", __func__); | 1057 | pr_info("%s: retry temporary address regeneration\n", __func__); |
@@ -2079,7 +2079,7 @@ ok: | |||
2079 | addr_type&IPV6_ADDR_SCOPE_MASK, | 2079 | addr_type&IPV6_ADDR_SCOPE_MASK, |
2080 | addr_flags); | 2080 | addr_flags); |
2081 | 2081 | ||
2082 | if (!ifp || IS_ERR(ifp)) { | 2082 | if (IS_ERR_OR_NULL(ifp)) { |
2083 | in6_dev_put(in6_dev); | 2083 | in6_dev_put(in6_dev); |
2084 | return; | 2084 | return; |
2085 | } | 2085 | } |