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

[Ulf H. <ul...@us...>]

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

Name            Old version     New version     Comment
----            -----------     -----------     -------
l2cap.c         1.106           1.107=20=20=20=20=20=20=20=20=20=20=20
l2cap_con.c     1.9             1.10=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Moved functions from l2cap_con to l2cap


The diff of the modified file(s):

--- l2cap.c	2001/04/25 17:12:48	1.106
+++ l2cap.c	2001/04/26 13:33:26	1.107
@@ -1847,6 +1847,43 @@
 	return result;=20=20=20=20
 }
=20
+/* only supports one call at a time */
+void
+l2ca_wait(const char *str, l2cap_con *con)
+{
+	if (!(con->c_flags & FLAG_WAKEMEUP)) {
+		if (con->c_flags & FLAG_DONTSLEEP) {
+			printk("l2ca_wait : don't sleep flag set\n");
+			return;
+		}
+
+		con->c_flags |=3D FLAG_WAKEMEUP;
+		printk("%s, sleep on wq 0x%x\n", str, (int)&con->wq);
+		interruptible_sleep_on(&con->wq);
+		printk("%s, woke up !\n", str);
+	} else {
+		printk("%s, wq already in use\n", str);
+	}
+}
+
+void=20
+l2ca_wakeup(const char *str, l2cap_con *con)
+{
+	if (con->c_flags & FLAG_WAKEMEUP) {
+		if (con->c_flags & FLAG_DONTSLEEP) {
+			printk("l2ca_wakeup : don't sleep flag set\n");
+			con->c_flags &=3D ~FLAG_DONTSLEEP;
+			return;
+		}
+
+		con->c_flags &=3D ~FLAG_WAKEMEUP;
+		printk("%s, wake up wq 0x%x\n", str,(int)&con->wq);
+		wake_up_interruptible(&con->wq);
+	} else {
+		printk("%s, wake up flag not set\n", str);
+	}
+}
+
 /*******************************************************************/
 /* (E5) Timer events */
 /********************/
--- l2cap_con.c	2001/04/19 10:31:34	1.9
+++ l2cap_con.c	2001/04/26 13:33:26	1.10
@@ -479,43 +479,6 @@
 	return sum;
 }
=20
-/* only supports one call at a time */
-void
-l2ca_wait(const char *str, l2cap_con *con)
-{
-	if (!(con->c_flags & FLAG_WAKEMEUP)) {
-		if (con->c_flags & FLAG_DONTSLEEP) {
-			printk("l2ca_wait : don't sleep flag set\n");
-			return;
-		}
-
-		con->c_flags |=3D FLAG_WAKEMEUP;
-		printk("%s, sleep on wq 0x%x\n", str, (int)&con->wq);
-		interruptible_sleep_on(&con->wq);
-		printk("%s, woke up !\n", str);
-	} else {
-		printk("%s, wq already in use\n", str);
-	}
-}
-
-void=20
-l2ca_wakeup(const char *str, l2cap_con *con)
-{
-	if (con->c_flags & FLAG_WAKEMEUP) {
-		if (con->c_flags & FLAG_DONTSLEEP) {
-			printk("l2ca_wakeup : don't sleep flag set\n");
-			con->c_flags &=3D ~FLAG_DONTSLEEP;
-			return;
-		}
-
-		con->c_flags &=3D ~FLAG_WAKEMEUP;
-		printk("%s, wake up wq 0x%x\n", str,(int)&con->wq);
-		wake_up_interruptible(&con->wq);
-	} else {
-		printk("%s, wake up flag not set\n", str);
-	}
-}
-
 #if L2CAP_SELFTEST
 s32=20
 remove_rcid(CID rcid) /* Searches for remote_cid */