summaryrefslogtreecommitdiffstats
path: root/sys/netipx
diff options
context:
space:
mode:
authorrwatson <rwatson@FreeBSD.org>2009-06-21 19:30:33 +0000
committerrwatson <rwatson@FreeBSD.org>2009-06-21 19:30:33 +0000
commit1f7e54e8c51edb13935d195e0c1f2ec68c672794 (patch)
tree2cfffa4418c1fa90f1e9d094aa882742d0ababb9 /sys/netipx
parent2fc79768f33d575d200ae1482dc23207f9d93703 (diff)
downloadFreeBSD-src-1f7e54e8c51edb13935d195e0c1f2ec68c672794.zip
FreeBSD-src-1f7e54e8c51edb13935d195e0c1f2ec68c672794.tar.gz
Clean up common ifaddr management:
- Unify reference count and lock initialization in a single function, ifa_init(). - Move tear-down from a macro (IFAFREE) to a function ifa_free(). - Move reference count bump from a macro (IFAREF) to a function ifa_ref(). - Instead of using a u_int protected by a mutex to refcount(9) for reference count management. The ifa_mtx is now used for exactly one ioctl, and possibly should be removed. MFC after: 3 weeks
Diffstat (limited to 'sys/netipx')
-rw-r--r--sys/netipx/ipx.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/netipx/ipx.c b/sys/netipx/ipx.c
index faaf8a0..3aa84e3 100644
--- a/sys/netipx/ipx.c
+++ b/sys/netipx/ipx.c
@@ -170,8 +170,7 @@ ipx_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp,
ipx_ifaddr = oia;
ia = oia;
ifa = (struct ifaddr *)ia;
- IFA_LOCK_INIT(ifa);
- ifa->ifa_refcnt = 1;
+ ifa_init(ifa);
TAILQ_INSERT_TAIL(&ifp->if_addrhead, ifa, ifa_link);
ia->ia_ifp = ifp;
ifa->ifa_addr = (struct sockaddr *)&ia->ia_addr;
@@ -231,7 +230,7 @@ ipx_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp,
else
printf("Didn't unlink ipxifadr from list\n");
}
- IFAFREE((&oia->ia_ifa));
+ ifa_free(&oia->ia_ifa);
return (0);
case SIOCAIFADDR:
OpenPOWER on IntegriCloud