diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2016-12-05 15:31:44 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2016-12-05 15:31:44 +0000 |
| commit | e5e885d0c4b4228349a2f8ed2749664131ff2554 (patch) | |
| tree | 0fee5636d87901648b0d4e7c29b1dc4195719629 /sys/netinet/igmp.c | |
| parent | 3d100bed7e17dd2604e5f1599df3b353a9eabe00 (diff) | |
Remove recursive splsoftnet()s in ioctl(2) path.
Diffstat (limited to 'sys/netinet/igmp.c')
| -rw-r--r-- | sys/netinet/igmp.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c index 1180f01bf30..11446ce4188 100644 --- a/sys/netinet/igmp.c +++ b/sys/netinet/igmp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: igmp.c,v 1.55 2016/11/28 11:12:45 mpi Exp $ */ +/* $OpenBSD: igmp.c,v 1.56 2016/12/05 15:31:43 mpi Exp $ */ /* $NetBSD: igmp.c,v 1.15 1996/02/13 23:41:25 christos Exp $ */ /* @@ -498,10 +498,9 @@ void igmp_joingroup(struct in_multi *inm) { struct ifnet* ifp; - int i, s; + int i; ifp = if_get(inm->inm_ifidx); - s = splsoftnet(); inm->inm_state = IGMP_IDLE_MEMBER; @@ -519,7 +518,6 @@ igmp_joingroup(struct in_multi *inm) inm->inm_timer = 0; out: - splx(s); if_put(ifp); } @@ -527,10 +525,8 @@ void igmp_leavegroup(struct in_multi *inm) { struct ifnet* ifp; - int s; ifp = if_get(inm->inm_ifidx); - s = splsoftnet(); switch (inm->inm_state) { case IGMP_DELAYING_MEMBER: @@ -546,7 +542,6 @@ igmp_leavegroup(struct in_multi *inm) case IGMP_SLEEPING_MEMBER: break; } - splx(s); if_put(ifp); } |