summaryrefslogtreecommitdiff
path: root/sys/netgraph/bluetooth/socket
diff options
context:
space:
mode:
authorMaksim Yevmenkin <emax@FreeBSD.org>2009-02-10 20:27:05 +0000
committerMaksim Yevmenkin <emax@FreeBSD.org>2009-02-10 20:27:05 +0000
commit320a8190870b3a8a99677b9dbd793e41afa8b115 (patch)
tree21f393de80bc6a45ae4a01486afe94b8738ecf4b /sys/netgraph/bluetooth/socket
parent330528331ccfa30d2ac7965e1e4fa4d7f8c060b2 (diff)
Notes
Diffstat (limited to 'sys/netgraph/bluetooth/socket')
-rw-r--r--sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c20
1 files changed, 6 insertions, 14 deletions
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
index 0fc193890168..0f409b5b4e15 100644
--- a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
+++ b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
@@ -518,13 +518,9 @@ ng_btsocket_rfcomm_connect(struct socket *so, struct sockaddr *nam,
return (EDESTADDRREQ);
/*
- * XXX FIXME - This is FUBAR. socreate() will call soalloc(1), i.e.
- * soalloc() is allowed to sleep in MALLOC. This creates "could sleep"
- * WITNESS warnings. To work around this problem we will create L2CAP
- * socket first and then check if we actually need it. Note that we
- * will not check for errors in socreate() because if we failed to
- * create L2CAP socket at this point we still might have already open
- * session.
+ * Note that we will not check for errors in socreate() because
+ * if we failed to create L2CAP socket at this point we still
+ * might have already open session.
*/
error = socreate(PF_BLUETOOTH, &l2so, SOCK_SEQPACKET,
@@ -857,13 +853,9 @@ ng_btsocket_rfcomm_listen(struct socket *so, int backlog, struct thread *td)
mtx_unlock(&pcb->pcb_mtx);
/*
- * XXX FIXME - This is FUBAR. socreate() will call soalloc(1), i.e.
- * soalloc() is allowed to sleep in MALLOC. This creates "could sleep"
- * WITNESS warnings. To work around this problem we will create L2CAP
- * socket first and then check if we actually need it. Note that we
- * will not check for errors in socreate() because if we failed to
- * create L2CAP socket at this point we still might have already open
- * session.
+ * Note that we will not check for errors in socreate() because
+ * if we failed to create L2CAP socket at this point we still
+ * might have already open session.
*/
socreate_error = socreate(PF_BLUETOOTH, &l2so, SOCK_SEQPACKET,