diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2013-03-07 09:03:17 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2013-03-07 09:03:17 +0000 |
| commit | 799b60fe8d7f2072745d9d4eb23580e8d96feb2b (patch) | |
| tree | d9cdc7feaae887121345cf7f3597b27c1e32203f /sys/netinet6/in6.c | |
| parent | 643af94b7afc643d06d26b0841c0d4d7fcc8591d (diff) | |
Remove the IFAFREE() macro, the ifafree() function it was calling already
check for the reference counter.
ok mikeb@, miod@, pelikan@, kettenis@, krw@
Diffstat (limited to 'sys/netinet6/in6.c')
| -rw-r--r-- | sys/netinet6/in6.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index f1916ff4469..d1500ea6c8f 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6.c,v 1.104 2013/03/04 14:42:25 bluhm Exp $ */ +/* $OpenBSD: in6.c,v 1.105 2013/03/07 09:03:16 mpi Exp $ */ /* $KAME: in6.c,v 1.372 2004/06/14 08:14:21 itojun Exp $ */ /* @@ -194,7 +194,7 @@ in6_ifloop_request(int cmd, struct ifaddr *ifa) * of the loopback address. */ if (cmd == RTM_ADD && nrt && ifa != nrt->rt_ifa) { - IFAFREE(nrt->rt_ifa); + ifafree(nrt->rt_ifa); ifa->ifa_refcnt++; nrt->rt_ifa = ifa; } @@ -1276,7 +1276,7 @@ in6_unlink_ifa(struct in6_ifaddr *ia, struct ifnet *ifp) * release another refcnt for the link from in6_ifaddr. * Note that we should decrement the refcnt at least once for all *BSD. */ - IFAFREE(&oia->ia_ifa); + ifafree(&oia->ia_ifa); splx(s); } @@ -1596,7 +1596,7 @@ in6_savemkludge(struct in6_ifaddr *oia) for (in6m = LIST_FIRST(&oia->ia6_multiaddrs); in6m != LIST_END(&oia->ia6_multiaddrs); in6m = next) { next = LIST_NEXT(in6m, in6m_entry); - IFAFREE(&in6m->in6m_ia->ia_ifa); + ifafree(&in6m->in6m_ia->ia_ifa); ia->ia_ifa.ifa_refcnt++; in6m->in6m_ia = ia; LIST_INSERT_HEAD(&ia->ia6_multiaddrs, in6m, in6m_entry); @@ -1614,7 +1614,7 @@ in6_savemkludge(struct in6_ifaddr *oia) for (in6m = LIST_FIRST(&oia->ia6_multiaddrs); in6m != LIST_END(&oia->ia6_multiaddrs); in6m = next) { next = LIST_NEXT(in6m, in6m_entry); - IFAFREE(&in6m->in6m_ia->ia_ifa); /* release reference */ + ifafree(&in6m->in6m_ia->ia_ifa); /* release reference */ in6m->in6m_ia = NULL; LIST_INSERT_HEAD(&mk->mk_head, in6m, in6m_entry); } @@ -1762,7 +1762,7 @@ in6_addmulti(struct in6_addr *maddr6, struct ifnet *ifp, int *errorp) if (*errorp) { LIST_REMOVE(in6m, in6m_entry); free(in6m, M_IPMADDR); - IFAFREE(&ia->ia_ifa); + ifafree(&ia->ia_ifa); splx(s); return (NULL); } @@ -1797,7 +1797,7 @@ in6_delmulti(struct in6_multi *in6m) */ LIST_REMOVE(in6m, in6m_entry); if (in6m->in6m_ia) { - IFAFREE(&in6m->in6m_ia->ia_ifa); /* release reference */ + ifafree(&in6m->in6m_ia->ia_ifa); /* release reference */ } /* |