D28649.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D28649.diff
View Options

	diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c
	--- a/sys/netinet6/in6.c
	+++ b/sys/netinet6/in6.c
	@@ -1921,10 +1921,8 @@
	besta = (struct in6_ifaddr *)ifa;
	}
	}
	- if (besta) {
	- ifa_ref(&besta->ia_ifa);
	+ if (besta)
	return (besta);
	- }

	CK_STAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
	if (ifa->ifa_addr->sa_family != AF_INET6)
	@@ -1941,20 +1939,14 @@
	continue;
	}

	- if (ifa != NULL)
	- ifa_ref(ifa);
	return (struct in6_ifaddr *)ifa;
	}

	/* use the last-resort values, that are, deprecated addresses */
	- if (dep[0]) {
	- ifa_ref((struct ifaddr *)dep[0]);
	+ if (dep[0])
	return dep[0];
	- }
	- if (dep[1]) {
	- ifa_ref((struct ifaddr *)dep[1]);
	+ if (dep[1])
	return dep[1];
	- }

	return NULL;
	}
	diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
	--- a/sys/netinet6/ip6_output.c
	+++ b/sys/netinet6/ip6_output.c
	@@ -1177,7 +1177,6 @@
	counter_u64_add(ia6->ia_ifa.ifa_opackets, 1);
	counter_u64_add(ia6->ia_ifa.ifa_obytes,
	m->m_pkthdr.len);
	- ifa_free(&ia6->ia_ifa);
	}
	error = ip6_output_send(inp, ifp, origifp, m, dst, ro,
	(flags & IP_NO_SND_TAG_RL) ? false : true);