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

Commit eb7e0575 authored by Sorin Dumitru's avatar Sorin Dumitru Committed by David S. Miller
Browse files

ipv6: remove some deadcode



__ipv6_regen_rndid no longer returns anything other than 0
so there's no point in verifying what it returns

Signed-off-by: default avatarSorin Dumitru <sdumitru@ixiacom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d1a53dfd
Loading
Loading
Loading
Loading
+7 −22
Original line number Original line Diff line number Diff line
@@ -127,8 +127,8 @@ static inline void addrconf_sysctl_unregister(struct inet6_dev *idev)
#endif
#endif


#ifdef CONFIG_IPV6_PRIVACY
#ifdef CONFIG_IPV6_PRIVACY
static int __ipv6_regen_rndid(struct inet6_dev *idev);
static void __ipv6_regen_rndid(struct inet6_dev *idev);
static int __ipv6_try_regen_rndid(struct inet6_dev *idev, struct in6_addr *tmpaddr);
static void __ipv6_try_regen_rndid(struct inet6_dev *idev, struct in6_addr *tmpaddr);
static void ipv6_regen_rndid(unsigned long data);
static void ipv6_regen_rndid(unsigned long data);
#endif
#endif


@@ -852,16 +852,7 @@ static int ipv6_create_tempaddr(struct inet6_ifaddr *ifp, struct inet6_ifaddr *i
	}
	}
	in6_ifa_hold(ifp);
	in6_ifa_hold(ifp);
	memcpy(addr.s6_addr, ifp->addr.s6_addr, 8);
	memcpy(addr.s6_addr, ifp->addr.s6_addr, 8);
	if (__ipv6_try_regen_rndid(idev, tmpaddr) < 0) {
	__ipv6_try_regen_rndid(idev, tmpaddr);
		spin_unlock_bh(&ifp->lock);
		write_unlock(&idev->lock);
		pr_warn("%s: regeneration of randomized interface id failed\n",
			__func__);
		in6_ifa_put(ifp);
		in6_dev_put(idev);
		ret = -1;
		goto out;
	}
	memcpy(&addr.s6_addr[8], idev->rndid, 8);
	memcpy(&addr.s6_addr[8], idev->rndid, 8);
	age = (now - ifp->tstamp) / HZ;
	age = (now - ifp->tstamp) / HZ;
	tmp_valid_lft = min_t(__u32,
	tmp_valid_lft = min_t(__u32,
@@ -1600,7 +1591,7 @@ static int ipv6_inherit_eui64(u8 *eui, struct inet6_dev *idev)


#ifdef CONFIG_IPV6_PRIVACY
#ifdef CONFIG_IPV6_PRIVACY
/* (re)generation of randomized interface identifier (RFC 3041 3.2, 3.5) */
/* (re)generation of randomized interface identifier (RFC 3041 3.2, 3.5) */
static int __ipv6_regen_rndid(struct inet6_dev *idev)
static void __ipv6_regen_rndid(struct inet6_dev *idev)
{
{
regen:
regen:
	get_random_bytes(idev->rndid, sizeof(idev->rndid));
	get_random_bytes(idev->rndid, sizeof(idev->rndid));
@@ -1627,8 +1618,6 @@ static int __ipv6_regen_rndid(struct inet6_dev *idev)
		if ((idev->rndid[2]|idev->rndid[3]|idev->rndid[4]|idev->rndid[5]|idev->rndid[6]|idev->rndid[7]) == 0x00)
		if ((idev->rndid[2]|idev->rndid[3]|idev->rndid[4]|idev->rndid[5]|idev->rndid[6]|idev->rndid[7]) == 0x00)
			goto regen;
			goto regen;
	}
	}

	return 0;
}
}


static void ipv6_regen_rndid(unsigned long data)
static void ipv6_regen_rndid(unsigned long data)
@@ -1642,8 +1631,7 @@ static void ipv6_regen_rndid(unsigned long data)
	if (idev->dead)
	if (idev->dead)
		goto out;
		goto out;


	if (__ipv6_regen_rndid(idev) < 0)
	__ipv6_regen_rndid(idev);
		goto out;


	expires = jiffies +
	expires = jiffies +
		idev->cnf.temp_prefered_lft * HZ -
		idev->cnf.temp_prefered_lft * HZ -
@@ -1664,13 +1652,10 @@ static void ipv6_regen_rndid(unsigned long data)
	in6_dev_put(idev);
	in6_dev_put(idev);
}
}


static int __ipv6_try_regen_rndid(struct inet6_dev *idev, struct in6_addr *tmpaddr)
static void  __ipv6_try_regen_rndid(struct inet6_dev *idev, struct in6_addr *tmpaddr)
{
{
	int ret = 0;

	if (tmpaddr && memcmp(idev->rndid, &tmpaddr->s6_addr[8], 8) == 0)
	if (tmpaddr && memcmp(idev->rndid, &tmpaddr->s6_addr[8], 8) == 0)
		ret = __ipv6_regen_rndid(idev);
		__ipv6_regen_rndid(idev);
	return ret;
}
}
#endif
#endif