CVS: The file 'linux/include/linux/bluetooth/l2cap.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.h         1.36            1.37=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

* modified echo / info functions
* added result param in l2cap_config_rsp



The diff of the modified file(s):

--- l2cap.h	2001/03/02 10:55:03	1.36
+++ l2cap.h	2001/03/30 09:44:15	1.37
@@ -80,7 +80,7 @@
 #define MIN_DYNAMIC_PSM 0x1001
 #define MAX_DYNAMIC_PSM 0xFFFF
=20
-/* Result in respones in L2CAP */
+/* Result in responses in L2CAP */
 #define RES_SUCCESS 0x0
 #define RES_PENDING 0x01
 #define RES_PSMNEG 0x02
@@ -338,12 +338,17 @@
                      u16 link_timeout);
=20
 s32 l2cap_config_rsp(l2cap_con* con, u32 out_mtu,=20
-                     flow *in_flow);
+                     flow *in_flow, s32 result);
=20
 s32 l2cap_disconnect_req(l2cap_con *con);
=20
 s32 l2cap_disconnect_rsp(l2cap_con* con);
=20
+s32 l2cap_echo_rsp(s32 hci_hdl, s32 id, u8 *opt_data, u16 opt_len);
+
+s32 l2cap_info_rsp(s32 hci_hdl, s32 id, u16 info_type, u8 *info_data,=20
+		   s32 info_len, s32 result);
+
 /*******************************************************************/
 /*  (E3) Data from peers */
 /************************/
@@ -368,15 +373,12 @@
 s32 l2ca_disconnect_req(l2cap_con *con);
 s32 l2ca_disconnect_rsp(l2cap_con *con);
=20
-s32 l2ca_ping(BD_ADDR bd);
-s32 l2cap_echo_req(l2cap_con *con, u8 *opt_data, s32 opt_len);
+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
=20
 s32 l2ca_getinfo(BD_ADDR bd, u16 infotype);
 s32 l2cap_info_req(l2cap_con *con, u16 info_type);
-s32 l2cap_info_rsp(s32 hci_hdl, s32 id, u16 info_type, u8 *info_data,=20
-		   s32 info_len, s32 result);
-
=20
 /**************************************************************/
 /* (E5) Timer events  */
@@ -432,8 +434,6 @@
=20
 /* FIXME */
 void l2ca_qos_violation_ind(l2cap_con *con);
-
-void l2ca_ping_rsp(u8* data, u32 len, BD_ADDR remote_bd);
=20
 int l2ca_opened(l2cap_con *con);
=20