ipv6: Use IS_ERR_OR_NULL().

PATCH In review YOSHIFUJI Hideaki 1 participant 1 message Jan 22, 2013

Subsystems (3)

Networking Network drivers IPv4/IPv6

lore

Share & tools

lore

YOSHIFUJI Hideaki

author

2013-01-22 16:32 UTC #0 lore raw

PATCH 3/4 ipv6: Use IS_ERR_OR_NULL().

Signed-off-by YOSHIFUJI Hideaki <[email protected]>

---
 net/ipv6/addrconf.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

net/ipv6/addrconf.c +2 -2

index 420e563..80d5980 100644
@@ -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;
 			}

Signature · 1 line

1.7.9.5