From ee43d395f23778051691eb4bfc357fa8a319dc36 Mon Sep 17 00:00:00 2001
From: Uwe Stuehler <uwe@cvs.openbsd.org>
Date: Sat, 22 Nov 2008 04:42:59 +0000
Subject: Sync bluetooth with NetBSD

---
 sys/netbt/l2cap_socket.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'sys/netbt/l2cap_socket.c')

diff --git a/sys/netbt/l2cap_socket.c b/sys/netbt/l2cap_socket.c
index b1d6ee6b355..b67838481a6 100644
--- a/sys/netbt/l2cap_socket.c
+++ b/sys/netbt/l2cap_socket.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: l2cap_socket.c,v 1.2 2008/05/27 19:41:14 thib Exp $	*/
-/*	$NetBSD: l2cap_socket.c,v 1.7 2007/04/21 06:15:23 plunky Exp $	*/
+/*	$OpenBSD: l2cap_socket.c,v 1.3 2008/11/22 04:42:58 uwe Exp $	*/
+/*	$NetBSD: l2cap_socket.c,v 1.9 2008/08/06 15:01:24 plunky Exp $	*/
 
 /*-
  * Copyright (c) 2005 Iain Hibbert.
@@ -125,9 +125,9 @@ l2cap_usrreq(struct socket *up, int req, struct mbuf *m,
 #endif
 
 	case PRU_ATTACH:
+		/* XXX solock() and bt_lock fiddling in NetBSD */
 		if (pcb != NULL)
 			return EINVAL;
-
 		/*
 		 * For L2CAP socket PCB we just use an l2cap_channel structure
 		 * since we have nothing to add..
-- 
cgit v1.2.3