diff options
| author |   yasuoka <yasuoka@openbsd.org> | 2017-05-28 12:51:33 +0000 |
|---|---|---|
| committer | yasuoka <yasuoka@openbsd.org> | 2017-05-28 12:51:33 +0000 |
| commit | f930cf622caeb0e18f3e7cb81c7b5f75c8dcd85f (patch) | |
| tree | a1181a2023e4c3b91b4e3ad5c5521a1443283628 /sys/net/if_ethersubr.c | |
| parent | Leaving IP multicast group requires the NET_LOCK(). (diff) | |
| download | wireguard-openbsd-f930cf622caeb0e18f3e7cb81c7b5f75c8dcd85f.tar.xz wireguard-openbsd-f930cf622caeb0e18f3e7cb81c7b5f75c8dcd85f.zip | |
Remove all splnet/splx from pipex(4) and pppx(4) and replace some of
them by NET_LOCK/NET_UNLOCK. Also make the timeout for pipex_timer
run with a thread context and replace pipex softintr by NETISR_PIPEX.
ok mpi
Diffstat (limited to 'sys/net/if_ethersubr.c')
| -rw-r--r-- | sys/net/if_ethersubr.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index ac04b9ce0b4..b1b49434b04 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ethersubr.c,v 1.243 2017/05/22 01:56:22 dlg Exp $ */ +/* $OpenBSD: if_ethersubr.c,v 1.244 2017/05/28 12:51:34 yasuoka Exp $ */ /* $NetBSD: if_ethersubr.c,v 1.19 1996/05/07 02:40:30 thorpej Exp $ */ /* @@ -416,14 +416,15 @@ decapsulate: #ifdef PIPEX if (pipex_enable) { struct pipex_session *session; + int s; - KERNEL_LOCK(); + NET_LOCK(s); if ((session = pipex_pppoe_lookup_session(m)) != NULL) { pipex_pppoe_input(m, session); - KERNEL_UNLOCK(); + NET_UNLOCK(s); return (1); } - KERNEL_UNLOCK(); + NET_UNLOCK(s); } #endif if (etype == ETHERTYPE_PPPOEDISC) |