diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2013-06-20 12:03:41 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2013-06-20 12:03:41 +0000 |
| commit | c15d8852aa3337e78fbcc20cb4a51385e1cba4c0 (patch) | |
| tree | bd2ecb37c6c503bdb2278f929290f5360d27b611 /sys/netinet/in.c | |
| parent | bb4310ae8425f0b8f24cd6eeb87a6738fec8777a (diff) | |
Revert previous and unbreak asr, the new include should be protected.
Reported by naddy@
Diffstat (limited to 'sys/netinet/in.c')
| -rw-r--r-- | sys/netinet/in.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/netinet/in.c b/sys/netinet/in.c index 7c5e050d841..663b5a78cea 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in.c,v 1.79 2013/06/20 09:38:24 mpi Exp $ */ +/* $OpenBSD: in.c,v 1.80 2013/06/20 12:03:40 mpi Exp $ */ /* $NetBSD: in.c,v 1.26 1996/02/13 23:41:39 christos Exp $ */ /* @@ -343,7 +343,7 @@ in_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp) in_ifscrub(ifp, ia); error = in_ifinit(ifp, ia, satosin(&ifr->ifr_addr), newifaddr); if (!error) - dohooks(&ifp->if_addrhooks, 0); + dohooks(ifp->if_addrhooks, 0); else if (newifaddr) { splx(s); goto cleanup; @@ -393,7 +393,7 @@ in_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp) error = in_ifinit(ifp, ia, &ifra->ifra_addr, newifaddr); } if (!error) - dohooks(&ifp->if_addrhooks, 0); + dohooks(ifp->if_addrhooks, 0); else if (newifaddr) { splx(s); goto cleanup; @@ -425,7 +425,7 @@ cleanup: ia->ia_ifp = NULL; ifafree((&ia->ia_ifa)); if (!error) - dohooks(&ifp->if_addrhooks, 0); + dohooks(ifp->if_addrhooks, 0); splx(s); return (error); } |