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/net/if_vlan.c | |
| parent | bb4310ae8425f0b8f24cd6eeb87a6738fec8777a (diff) | |
Revert previous and unbreak asr, the new include should be protected.
Reported by naddy@
Diffstat (limited to 'sys/net/if_vlan.c')
| -rw-r--r-- | sys/net/if_vlan.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index e47e372f0f2..ddcfd0666a5 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vlan.c,v 1.96 2013/06/20 09:38:24 mpi Exp $ */ +/* $OpenBSD: if_vlan.c,v 1.97 2013/06/20 12:03:40 mpi Exp $ */ /* * Copyright 1998 Massachusetts Institute of Technology @@ -448,11 +448,11 @@ vlan_config(struct ifvlan *ifv, struct ifnet *p, u_int16_t tag) LIST_INSERT_HEAD(&tagh[TAG_HASH(tag)], ifv, ifv_list); /* Register callback for physical link state changes */ - ifv->lh_cookie = hook_establish(&p->if_linkstatehooks, 1, + ifv->lh_cookie = hook_establish(p->if_linkstatehooks, 1, vlan_vlandev_state, ifv); /* Register callback if parent wants to unregister */ - ifv->dh_cookie = hook_establish(&p->if_detachhooks, 1, + ifv->dh_cookie = hook_establish(p->if_detachhooks, 1, vlan_ifdetach, ifv); vlan_vlandev_state(ifv); @@ -484,10 +484,10 @@ vlan_unconfig(struct ifnet *ifp, struct ifnet *newp) s = splnet(); LIST_REMOVE(ifv, ifv_list); if (ifv->lh_cookie != NULL) - hook_disestablish(&p->if_linkstatehooks, ifv->lh_cookie); + hook_disestablish(p->if_linkstatehooks, ifv->lh_cookie); /* The cookie is NULL if disestablished externally */ if (ifv->dh_cookie != NULL) - hook_disestablish(&p->if_detachhooks, ifv->dh_cookie); + hook_disestablish(p->if_detachhooks, ifv->dh_cookie); /* Reset link state */ if (newp != NULL) { ifp->if_link_state = LINK_STATE_INVALID; |