From 45df41ff94d723df9fefb6fb82bc6d0dca556e99 Mon Sep 17 00:00:00 2001 From: Reyk Floeter Date: Sat, 19 Oct 2013 11:37:21 +0000 Subject: In an ideal world, we would use splsoftnet() for all the interface configuration steps. But vxlan(4) has to configure the link state and address hooks of a parent interface that potentially need splnet(). So revert everything back to use splnet() for now. Discussed with mpi@ --- sys/net/if_vxlan.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'sys') diff --git a/sys/net/if_vxlan.c b/sys/net/if_vxlan.c index 4c11bcda982..c9d706974d7 100644 --- a/sys/net/if_vxlan.c +++ b/sys/net/if_vxlan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vxlan.c,v 1.6 2013/10/19 11:20:08 reyk Exp $ */ +/* $OpenBSD: if_vxlan.c,v 1.7 2013/10/19 11:37:20 reyk Exp $ */ /* * Copyright (c) 2013 Reyk Floeter @@ -157,7 +157,7 @@ vxlan_clone_destroy(struct ifnet *ifp) struct vxlan_softc *sc = ifp->if_softc; int s; - s = splsoftnet(); + s = splnet(); vxlan_multicast_cleanup(ifp); splx(s); @@ -383,7 +383,7 @@ vxlanioctl(struct ifnet *ifp, u_long cmd, caddr_t data) case SIOCDIFPHYADDR: if ((error = suser(p, 0)) != 0) break; - s = splsoftnet(); + s = splnet(); vxlan_multicast_cleanup(ifp); bzero(&sc->sc_src, sizeof(sc->sc_src)); bzero(&sc->sc_dst, sizeof(sc->sc_dst)); @@ -411,7 +411,7 @@ vxlanioctl(struct ifnet *ifp, u_long cmd, caddr_t data) error = EINVAL; break; } - s = splsoftnet(); + s = splnet(); sc->sc_rtableid = ifr->ifr_rdomainid; (void)vxlan_config(ifp, NULL, NULL); splx(s); @@ -430,7 +430,7 @@ vxlanioctl(struct ifnet *ifp, u_long cmd, caddr_t data) } if (sc->sc_ttl == (u_int8_t)ifr->ifr_ttl) break; - s = splsoftnet(); + s = splnet(); sc->sc_ttl = (u_int8_t)(ifr->ifr_ttl); (void)vxlan_config(ifp, NULL, NULL); splx(s); @@ -447,7 +447,7 @@ vxlanioctl(struct ifnet *ifp, u_long cmd, caddr_t data) error = EINVAL; break; } - s = splsoftnet(); + s = splnet(); sc->sc_vnetid = (u_int32_t)ifr->ifr_vnetid; (void)vxlan_config(ifp, NULL, NULL); splx(s); -- cgit v1.2.3