Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f0d2ba0 authored by YOSHIFUJI Hideaki / 吉藤英明's avatar YOSHIFUJI Hideaki / 吉藤英明 Committed by David S. Miller
Browse files

ipv6: Use IS_ERR_OR_NULL(). 



Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 50c3a487

net/ipv6/addrconf.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1051,7 +1051,7 @@ static int ipv6_create_tempaddr(struct inet6_ifaddr *ifp, struct inet6_ifaddr *i 
		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 @@ void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len, bool sllao) 
						    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;

			}

			}