ipv6: Use IS_ERR_OR_NULL().
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
50c3a487d5
commit
3f0d2ba0bd
1 changed files with 2 additions and 2 deletions
|
@ -1051,7 +1051,7 @@ retry:
|
||||||
ipv6_add_addr(idev, &addr, tmp_plen,
|
ipv6_add_addr(idev, &addr, tmp_plen,
|
||||||
ipv6_addr_type(&addr)&IPV6_ADDR_SCOPE_MASK,
|
ipv6_addr_type(&addr)&IPV6_ADDR_SCOPE_MASK,
|
||||||
addr_flags) : NULL;
|
addr_flags) : NULL;
|
||||||
if (!ift || IS_ERR(ift)) {
|
if (IS_ERR_OR_NULL(ift)) {
|
||||||
in6_ifa_put(ifp);
|
in6_ifa_put(ifp);
|
||||||
in6_dev_put(idev);
|
in6_dev_put(idev);
|
||||||
pr_info("%s: retry temporary address regeneration\n", __func__);
|
pr_info("%s: retry temporary address regeneration\n", __func__);
|
||||||
|
@ -2079,7 +2079,7 @@ ok:
|
||||||
addr_type&IPV6_ADDR_SCOPE_MASK,
|
addr_type&IPV6_ADDR_SCOPE_MASK,
|
||||||
addr_flags);
|
addr_flags);
|
||||||
|
|
||||||
if (!ifp || IS_ERR(ifp)) {
|
if (IS_ERR_OR_NULL(ifp)) {
|
||||||
in6_dev_put(in6_dev);
|
in6_dev_put(in6_dev);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue