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/net/route.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/net/route.c')
| -rw-r--r-- | sys/net/route.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/net/route.c b/sys/net/route.c index 9ec8a47a79d..2ab5ae2fdc1 100644 --- a/sys/net/route.c +++ b/sys/net/route.c @@ -1,4 +1,4 @@ -/* $OpenBSD: route.c,v 1.141 2012/09/20 20:53:12 blambert Exp $ */ +/* $OpenBSD: route.c,v 1.142 2013/03/07 09:03:16 mpi Exp $ */ /* $NetBSD: route.c,v 1.14 1996/02/13 22:00:46 christos Exp $ */ /* @@ -401,7 +401,7 @@ rtfree(struct rtentry *rt) rt_timer_remove_all(rt); ifa = rt->rt_ifa; if (ifa) - IFAFREE(ifa); + ifafree(ifa); rtlabel_unref(rt->rt_labelid); #ifdef MPLS if (rt->rt_flags & RTF_MPLS) @@ -926,7 +926,7 @@ rtrequest1(int req, struct rt_addrinfo *info, u_int8_t prio, if ((*ret_nrt)->rt_ifa->ifa_rtrequest) (*ret_nrt)->rt_ifa->ifa_rtrequest( RTM_DELETE, *ret_nrt, NULL); - IFAFREE((*ret_nrt)->rt_ifa); + ifafree((*ret_nrt)->rt_ifa); (*ret_nrt)->rt_ifa = ifa; (*ret_nrt)->rt_ifp = ifa->ifa_ifp; ifa->ifa_refcnt++; @@ -957,7 +957,7 @@ rtrequest1(int req, struct rt_addrinfo *info, u_int8_t prio, RTFREE(crt); } if (rn == 0) { - IFAFREE(ifa); + ifafree(ifa); if ((rt->rt_flags & RTF_CLONED) != 0 && rt->rt_parent) rtfree(rt->rt_parent); if (rt->rt_gwroute) @@ -1139,7 +1139,7 @@ rtinit(struct ifaddr *ifa, int cmd, int flags) ifa, rt->rt_ifa); if (rt->rt_ifa->ifa_rtrequest) rt->rt_ifa->ifa_rtrequest(RTM_DELETE, rt, NULL); - IFAFREE(rt->rt_ifa); + ifafree(rt->rt_ifa); rt->rt_ifa = ifa; rt->rt_ifp = ifa->ifa_ifp; ifa->ifa_refcnt++; |