diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2015-11-02 14:35:13 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2015-11-02 14:35:13 +0000 |
| commit | 6c44b18cfc73c1d5db989598af750f98cef37552 (patch) | |
| tree | 6097f3bf6997111877390e7e19a6c8988e071e2d /sys | |
| parent | 663cb989145b2410df43dbfd58cf52567178dd61 (diff) | |
Some of the bridge code is running in splsoftnet now, change the
splassert() in bstp_notify_rtage() from IPL_NET to IPL_SOFTNET
accordingly.
OK mpi@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/net/bridgestp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c index ffa79c51374..ba7360f3323 100644 --- a/sys/net/bridgestp.c +++ b/sys/net/bridgestp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bridgestp.c,v 1.60 2015/09/29 10:11:40 deraadt Exp $ */ +/* $OpenBSD: bridgestp.c,v 1.61 2015/11/02 14:35:12 reyk Exp $ */ /* * Copyright (c) 2000 Jason L. Wright (jason@thought.net) @@ -1589,7 +1589,7 @@ bstp_notify_rtage(struct bstp_port *bp, int pending) { int age = 0; - splassert(IPL_NET); + splassert(IPL_SOFTNET); switch (bp->bp_protover) { case BSTP_PROTO_STP: |