bring netbt's usrreqs up to speed on the usrreq changes.

allows it too compile again.

pointed out by mk@ and deraadt@

8 files changed, 22 insertions, 19 deletions

diff --git a/sys/netbt/hci.h b/sys/netbt/hci.h
index 384dbadfea8..cc12dc5457f 100644
--- a/sys/netbt/hci.h
+++ b/sys/netbt/hci.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hci.h,v 1.10 2008/02/24 21:34:48 uwe Exp $	*/
+/*	$OpenBSD: hci.h,v 1.11 2008/05/27 19:41:14 thib Exp $	*/
 /*	$NetBSD: hci.h,v 1.22 2008/02/10 17:40:54 plunky Exp $	*/
 
 /*-
@@ -55,7 +55,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: hci.h,v 1.10 2008/02/24 21:34:48 uwe Exp $
+ * $Id: hci.h,v 1.11 2008/05/27 19:41:14 thib Exp $
  * $FreeBSD: src/sys/netgraph/bluetooth/include/ng_hci.h,v 1.6 2005/01/07 01:45:43 imp Exp $
  */
 
@@ -2545,7 +2545,8 @@ void hci_memo_free(struct hci_memo *);
 
 /* hci_socket.c */
 void hci_drop(void *);
-int hci_usrreq(struct socket *, int, struct mbuf *, struct mbuf *, struct mbuf *);
+int hci_usrreq(struct socket *, int, struct mbuf *, struct mbuf *,
+    struct mbuf *, struct proc *);
 int hci_ctloutput(int, struct socket *, int, int, struct mbuf **);
 void hci_mtap(struct mbuf *, struct hci_unit *);
 
diff --git a/sys/netbt/hci_socket.c b/sys/netbt/hci_socket.c
index 7e9c74ba3af..4e6fa332a9b 100644
--- a/sys/netbt/hci_socket.c
+++ b/sys/netbt/hci_socket.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hci_socket.c,v 1.5 2008/02/24 21:34:48 uwe Exp $	*/
+/*	$OpenBSD: hci_socket.c,v 1.6 2008/05/27 19:41:14 thib Exp $	*/
 /*	$NetBSD: hci_socket.c,v 1.14 2008/02/10 17:40:54 plunky Exp $	*/
 
 /*-
@@ -543,7 +543,7 @@ bad:
  */
 int
 hci_usrreq(struct socket *up, int req, struct mbuf *m,
-    struct mbuf *nam, struct mbuf *ctl)
+    struct mbuf *nam, struct mbuf *ctl, struct proc *p)
 {
 	struct hci_pcb *pcb = (struct hci_pcb *)up->so_pcb;
 	struct sockaddr_bt *sa;
diff --git a/sys/netbt/l2cap.h b/sys/netbt/l2cap.h
index 3500e38311a..cf6a89577a7 100644
--- a/sys/netbt/l2cap.h
+++ b/sys/netbt/l2cap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: l2cap.h,v 1.5 2008/02/24 21:34:48 uwe Exp $	*/
+/*	$OpenBSD: l2cap.h,v 1.6 2008/05/27 19:41:14 thib Exp $	*/
 /*	$NetBSD: l2cap.h,v 1.6 2007/11/03 17:20:17 plunky Exp $	*/
 
 /*-
@@ -55,7 +55,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: l2cap.h,v 1.5 2008/02/24 21:34:48 uwe Exp $
+ * $Id: l2cap.h,v 1.6 2008/05/27 19:41:14 thib Exp $
  * $FreeBSD: src/sys/netgraph/bluetooth/include/l2cap.h,v 1.4 2005/08/31 18:13:23 emax Exp $
  */
 
@@ -467,7 +467,8 @@ int l2cap_send_disconnect_req(struct l2cap_channel *);
 int l2cap_send_connect_rsp(struct hci_link *, uint8_t, uint16_t, uint16_t, uint16_t);
 
 /* l2cap_socket.c */
-int l2cap_usrreq(struct socket *, int, struct mbuf *, struct mbuf *, struct mbuf *);
+int l2cap_usrreq(struct socket *, int, struct mbuf *, struct mbuf *,
+    struct mbuf *, struct proc *);
 int l2cap_ctloutput(int, struct socket *, int, int, struct mbuf **);
 
 /* l2cap_upper.c */
diff --git a/sys/netbt/l2cap_socket.c b/sys/netbt/l2cap_socket.c
index cc24a086539..b1d6ee6b355 100644
--- a/sys/netbt/l2cap_socket.c
+++ b/sys/netbt/l2cap_socket.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: l2cap_socket.c,v 1.1 2007/06/01 02:46:11 uwe Exp $	*/
+/*	$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 $	*/
 
 /*-
@@ -104,7 +104,7 @@ int l2cap_recvspace = 4096;
  */
 int
 l2cap_usrreq(struct socket *up, int req, struct mbuf *m,
-    struct mbuf *nam, struct mbuf *ctl)
+    struct mbuf *nam, struct mbuf *ctl, struct proc *p)
 {
 	struct l2cap_channel *pcb = up->so_pcb;
 	struct sockaddr_bt *sa;
diff --git a/sys/netbt/rfcomm.h b/sys/netbt/rfcomm.h
index 2980c3ca762..056d3d49232 100644
--- a/sys/netbt/rfcomm.h
+++ b/sys/netbt/rfcomm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rfcomm.h,v 1.2 2008/02/24 21:34:48 uwe Exp $	*/
+/*	$OpenBSD: rfcomm.h,v 1.3 2008/05/27 19:41:14 thib Exp $	*/
 /*	$NetBSD: rfcomm.h,v 1.6 2007/11/20 20:25:58 plunky Exp $	*/
 
 /*-
@@ -56,7 +56,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: rfcomm.h,v 1.2 2008/02/24 21:34:48 uwe Exp $
+ * $Id: rfcomm.h,v 1.3 2008/05/27 19:41:14 thib Exp $
  * $FreeBSD: src/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h,v 1.4 2005/01/11 01:39:53 emax Exp $
  */
 
@@ -404,7 +404,8 @@ int rfcomm_session_send_uih(struct rfcomm_session *, struct rfcomm_dlc *, int, s
 int rfcomm_session_send_mcc(struct rfcomm_session *, int, uint8_t, void *, int);
 
 /* rfcomm_socket.c */
-int rfcomm_usrreq(struct socket *, int, struct mbuf *, struct mbuf *, struct mbuf *);
+int rfcomm_usrreq(struct socket *, int, struct mbuf *, struct mbuf *,
+    struct mbuf *, struct proc *);
 int rfcomm_ctloutput(int, struct socket *, int, int, struct mbuf **);
 
 /* rfcomm_upper.c */
diff --git a/sys/netbt/rfcomm_socket.c b/sys/netbt/rfcomm_socket.c
index 72cb1e42c6c..1c0e69db564 100644
--- a/sys/netbt/rfcomm_socket.c
+++ b/sys/netbt/rfcomm_socket.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rfcomm_socket.c,v 1.2 2008/02/24 21:34:48 uwe Exp $	*/
+/*	$OpenBSD: rfcomm_socket.c,v 1.3 2008/05/27 19:41:14 thib Exp $	*/
 /*	$NetBSD: rfcomm_socket.c,v 1.8 2007/10/15 18:04:34 plunky Exp $	*/
 
 /*-
@@ -101,7 +101,7 @@ int rfcomm_recvspace = 4096;
  */
 int
 rfcomm_usrreq(struct socket *up, int req, struct mbuf *m,
-		struct mbuf *nam, struct mbuf *ctl)
+    struct mbuf *nam, struct mbuf *ctl, struct proc *p)
 {
 	struct rfcomm_dlc *pcb = up->so_pcb;
 	struct sockaddr_bt *sa;
diff --git a/sys/netbt/sco.h b/sys/netbt/sco.h
index 95849af88a4..9db741eabcb 100644
--- a/sys/netbt/sco.h
+++ b/sys/netbt/sco.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sco.h,v 1.2 2007/06/01 02:46:12 uwe Exp $	*/
+/*	$OpenBSD: sco.h,v 1.3 2008/05/27 19:41:14 thib Exp $	*/
 /*	$NetBSD: sco.h,v 1.2 2006/07/26 10:20:56 tron Exp $	*/
 
 /*-
@@ -65,7 +65,7 @@ struct socket;
 extern int sco_sendspace;
 extern int sco_recvspace;
 int sco_usrreq(struct socket *, int, struct mbuf *,
-		struct mbuf *, struct mbuf *);
+		struct mbuf *, struct mbuf *, struct proc *);
 int sco_ctloutput(int, struct socket *, int, int, struct mbuf **);
 
 /* sco_upper.c */
diff --git a/sys/netbt/sco_socket.c b/sys/netbt/sco_socket.c
index c0cf4bf5611..954e0465abd 100644
--- a/sys/netbt/sco_socket.c
+++ b/sys/netbt/sco_socket.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sco_socket.c,v 1.1 2007/06/01 02:46:12 uwe Exp $	*/
+/*	$OpenBSD: sco_socket.c,v 1.2 2008/05/27 19:41:14 thib Exp $	*/
 /*	$NetBSD: sco_socket.c,v 1.9 2007/04/21 06:15:23 plunky Exp $	*/
 
 /*-
@@ -96,7 +96,7 @@ int sco_recvspace = 4096;
  */
 int
 sco_usrreq(struct socket *up, int req, struct mbuf *m,
-    struct mbuf *nam, struct mbuf *ctl)
+    struct mbuf *nam, struct mbuf *ctl, struct proc *p)
 {
 	struct sco_pcb *pcb = (struct sco_pcb *)up->so_pcb;
 	struct sockaddr_bt *sa;