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

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

The following files were modified in linux/include/linux/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
l2cap.h         1.37            1.38=20=20=20=20=20=20=20=20=20=20=20=20
l2cap_con.h     1.6             1.7=20=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

* moved declarations of l2ca_wait/wakeup to l2cap.h
* some cleanup


The diff of the modified file(s):

--- l2cap.h	2001/03/30 09:44:15	1.37
+++ l2cap.h	2001/04/27 10:16:09	1.38
@@ -376,17 +376,11 @@
 s32 l2ca_ping(BD_ADDR bd, u8 *opt_data, u16 len);
 s32 l2cap_echo_req(l2cap_con *con, u8 *opt_data, u16 opt_len);
=20
-
 s32 l2ca_getinfo(BD_ADDR bd, u16 infotype);
 s32 l2cap_info_req(l2cap_con *con, u16 info_type);
=20
-/**************************************************************/
-/* (E5) Timer events  */
-/**********************/
-
-/* FIXME */
-/* RTX timer */
-/* ERTX timer */
+void l2ca_wait(const char *str, l2cap_con *con);
+void l2ca_wakeup(const char *str, l2cap_con *con);
=20
 /*******************************************************************/
 /*-------------------------- ACTIONS ------------------------------*/
@@ -429,8 +423,7 @@
 void l2ca_disconnect_ind(l2cap_con *con);
 void l2ca_disconnect_cfm(l2cap_con *con);
=20
-/* FIXME */
-void l2ca_timeout_ind(l2cap_con *con);
+void l2ca_timeoutind(l2cap_con *con);
=20
 /* FIXME */
 void l2ca_qos_violation_ind(l2cap_con *con);
@@ -447,7 +440,6 @@
 /***********************/
=20
 /* GROUP functions not implemented */
-/* INFO functions not implemented */
 /* CONNECTIONLESS functions not implemented */
=20
=20=20
--- l2cap_con.h	2001/04/19 10:31:34	1.6
+++ l2cap_con.h	2001/04/27 10:16:09	1.7
@@ -108,9 +108,6 @@
 void show_list(void);
 s32 count_con(u16 hci_hdl);
=20
-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);