CVS: The file 'linux/include/linux/bluetooth/l2cap_con.h' has been modified.

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

The following file was modified in linux/include/linux/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
l2cap_con.h     1.4             1.5=20=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

* added flags defines used to control blocking waitqueues
* added result defines used to return internal connection status to=20
  upper layers
* added l2ca_wait / l2ca_wakeup, used to block on a connection



The diff of the modified file(s):

--- l2cap_con.h	2001/02/15 16:28:47	1.4
+++ l2cap_con.h	2001/03/30 09:45:06	1.5
@@ -57,10 +57,22 @@
 /* internal test of connection manager */
 #define L2CAP_SELFTEST 0
=20
-
 /****************** TYPE DEFINITION SECTION ******************************=
***/
=20
+/* con->c_flags */
+#define FLAG_WAKEMEUP 0x1 /* wake up con->wq */
+#define FLAG_RETURNNOW 2 /* return immediately, used when setting up=20
+				baseband */
+#define FLAG_DONTSLEEP (2<<2) /* used when e.g ertx_timeout calls disc req=
 */
+#define FLAG_SOMETHING  (2<<3) /* ??? */
=20
+/* con->c_status */
+#define CSTATUS_SUCCESS 0 /* return status success to upper caller */
+#define CSTATUS_FAILED 1  /* return status failed to upper caller */
+#define CSTATUS_RTX_TIMEOUT 2 /* resend request */
+#define CSTATUS_ERTX_TIMEOUT 3 /* disconnect link */
+#define CSTATUS_MAX_NO_RTX 4
+#define CSTATUS_CMDREJECT 5
=20
 /****************** EXPORTED FUNCTION DECLARATION SECTION ****************=
***/
=20
@@ -96,6 +108,10 @@
 void show_con(const u8* head, l2cap_con* con);
 void show_list(void);
 s32 count_con(u16 hci_hdl);
+
+void l2ca_wait(const char *str, l2cap_con *con);
+void l2ca_wakeup(const char *str, l2cap_con *con);
+
=20
 #if L2CAP_SELFTEST
 void test_conlist(void);