CVS: 3 files have been modified in linux/drivers/char/bluetooth.

[Mattias A. <mat...@us...>]

The following files were modified in linux/drivers/char/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
hci_vendor.c    1.21            1.22=20=20=20=20=20=20=20=20=20=20=20=20
rfcomm.c        1.100           1.101=20=20=20=20=20=20=20=20=20=20=20
sdp.c           1.73            1.74=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

use kernel wait queue structs when doing busywait in usermode stack
(emulates blocking calls with usermode stack define of interuptible_sleep_on
and wake_up_interruptible in btcommon.h)


The diff of the modified file(s):

--- hci_vendor.c	2001/04/10 13:04:24	1.21
+++ hci_vendor.c	2001/04/17 10:00:26	1.22
@@ -88,7 +88,6 @@
 /* These are declared in hci.c */
 extern cmd_pkt c_pkt;
=20
-#if __KERNEL__
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
 extern struct wait_queue *hci_wq;
 extern struct wait_queue *set_baudrate_wq;
@@ -96,7 +95,6 @@
 extern wait_queue_head_t hci_wq;
 extern wait_queue_head_t set_baudrate_wq;
 #endif /* LINUX_VERSION_CODE */
-#endif /* __KERNEL__ */
=20
 extern hci_controller hci_ctrl;
=20
--- rfcomm.c	2001/04/12 16:25:58	1.100
+++ rfcomm.c	2001/04/17 10:00:26	1.101
@@ -544,8 +544,8 @@
 /* One RFCOMM connection for each bt_tty 0 to 6 */
=20
 #ifdef __KERNEL__
-
 static struct timer_list rfcomm_timer;
+#endif
 #define RFCOMM_CON_TIMEOUT (5*HZ)
=20
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
@@ -554,9 +554,6 @@
 static wait_queue_head_t rfcomm_disconnect_wq;
 #endif /* LINUX_VERSION_CODE */
=20
-#else
-static int rfcomm_disconnect_wq;
-#endif /* __KERNEL__ */
=20
 void send_send_data(unsigned long ptr);
=20
@@ -687,7 +684,17 @@
=20=20=20
 	DSYS("Shutting down RFCOMM\n");
=20
-	/* Reset rfcomm lines */
+#if 0
+	/* First try disconnecting */
+	for (i =3D 0; i < BT_NBR_DATAPORTS; i++) {
+		rfcomm_con *rfcomm =3D get_rfcomm_con(i);
+		if (get_connected_dlci(rfcomm) !=3D -1) {
+			DSYS("Now disconnecting rfcomm line %d\n", i);
+			rfcomm_disconnect_req(i);
+		}=09=09
+	}
+#endif
+	/* If still connections left, terminate them */
 	for (i =3D 0; i < BT_NBR_DATAPORTS; i++) {
 		rfcomm_reset_con(i);
 	}
--- sdp.c	2001/04/17 07:00:49	1.73
+++ sdp.c	2001/04/17 10:00:26	1.74
@@ -307,13 +307,11 @@
 /* Transaction id used for request */
 //static u16 req_trans_id =3D 0xaabb;
=20
-#ifdef __KERNEL__
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
 static struct wait_queue *sdp_disc_wq =3D NULL;
 #else
 static wait_queue_head_t sdp_disc_wq;
 #endif /* LINUX_VERSION_CODE */
-#endif /* __KERNEL__ */
=20
 #ifdef __KERNEL__
 static bt_tx_buf *db_write_tx_buf;