diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2006-03-04 22:40:17 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2006-03-04 22:40:17 +0000 |
| commit | b751ff7496fc73fe22ed7d0c2371837c4c2aed2c (patch) | |
| tree | bd1ae2cb58e37d25f97c0e7f581ad0b9035bf683 /sys/netbt | |
| parent | 15e7a983128283f9a61840e1ed37255bb4ada6fe (diff) | |
With the exception of two other small uncommited diffs this moves
the remainder of the network stack from splimp to splnet.
ok miod@
Diffstat (limited to 'sys/netbt')
| -rw-r--r-- | sys/netbt/bt_input.c | 4 | ||||
| -rw-r--r-- | sys/netbt/hci_raw.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/netbt/bt_input.c b/sys/netbt/bt_input.c index a6622342d40..3584f194603 100644 --- a/sys/netbt/bt_input.c +++ b/sys/netbt/bt_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bt_input.c,v 1.1 2005/01/14 12:04:02 grange Exp $ */ +/* $OpenBSD: bt_input.c,v 1.2 2006/03/04 22:40:16 brad Exp $ */ /* * Copyright (c) 2004 Alexander Yurchenko <grange@openbsd.org> * @@ -46,7 +46,7 @@ btintr(void) int s; for (;;) { - s = splimp(); + s = splnet(); IF_DEQUEUE(&btintrq, m); splx(s); diff --git a/sys/netbt/hci_raw.c b/sys/netbt/hci_raw.c index 1b29f736798..0feb03763a5 100644 --- a/sys/netbt/hci_raw.c +++ b/sys/netbt/hci_raw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hci_raw.c,v 1.3 2005/01/17 18:12:49 mickey Exp $ */ +/* $OpenBSD: hci_raw.c,v 1.4 2006/03/04 22:40:16 brad Exp $ */ /* * ng_btsocket_hci_raw.c @@ -338,7 +338,7 @@ ng_btsocket_hci_raw_node_rcvdata(struct ifnet *ifp, struct mbuf *m) NG_BT_ITEMQ_ENQUEUE(&ng_btsocket_hci_raw_queue, item); error = ng_btsocket_hci_raw_wakeup_input_task(); #endif - s = splimp(); + s = splnet(); IF_INPUT_ENQUEUE(&btintrq, nam); splx(s); schednetisr(NETISR_BT); @@ -697,7 +697,7 @@ ng_btsocket_hci_raw_output(void *arg1, int arg2) continue; if (strcmp(sa->hci_node, ifp->if_xname) == 0) { - s = splimp(); + s = splnet(); IFQ_ENQUEUE(&ifp->if_snd, m, NULL, error); if (error) { splx(s); |