summaryrefslogtreecommitdiff
path: root/sys/net/if_vlan.c
diff options
context:
space:
mode:
authorMarco Pfatschbacher <mpf@cvs.openbsd.org>2005-05-27 08:33:26 +0000
committerMarco Pfatschbacher <mpf@cvs.openbsd.org>2005-05-27 08:33:26 +0000
commit45ab67c67f6fe7b643e6edc52140c6ef638e8adb (patch)
tree1248e60c2be2828f491b6014ae4aca3fc0ac1a59 /sys/net/if_vlan.c
parent92679069f4ad386d7cc137e81855898197b88f75 (diff)
only access if_linkstatehooks inside splnet.
with pascoe@
Diffstat (limited to 'sys/net/if_vlan.c')
-rw-r--r--sys/net/if_vlan.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index 92faeb7dddd..0e0938cdeb8 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_vlan.c,v 1.54 2005/04/25 01:34:26 brad Exp $ */
+/* $OpenBSD: if_vlan.c,v 1.55 2005/05/27 08:33:25 mpf Exp $ */
/*
* Copyright 1998 Massachusetts Institute of Technology
@@ -499,6 +499,7 @@ vlan_unconfig(struct ifnet *ifp)
s = splnet();
LIST_REMOVE(ifv, ifv_list);
+ hook_disestablish(p->if_linkstatehooks, ifv->lh_cookie);
splx(s);
/*
@@ -512,7 +513,6 @@ vlan_unconfig(struct ifnet *ifp)
/* Disconnect from parent. */
ifv->ifv_p = NULL;
ifv->ifv_if.if_mtu = ETHERMTU;
- hook_disestablish(p->if_linkstatehooks, ifv->lh_cookie);
/* Clear our MAC address. */
ifa = ifnet_addrs[ifv->ifv_if.if_index];