Menu
▾
▴
openbt-commit
|
From: Anders J. <and...@us...> - 2002-01-06 17:33:05
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
l2cap.c 1.126 1.127=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
* Corrected return values when receiving PSM not supported.
* Updated PSM-value for UPF-7
The diff of the modified file(s):
--- l2cap.c 2001/11/30 13:08:07 1.126
+++ l2cap.c 2002/01/06 17:33:04 1.127
@@ -997,12 +997,12 @@
return;
}
=20=20=20=20=20=20=20=20=20=20
- con->c_status =3D conrsp->result;=09=09
+ con->c_result =3D conrsp->result;=09=09
+ con->c_status =3D CSTATUS_FAILED;
=20
switch (conrsp->result) {
case RES_SUCCESS:
-
- con->c_result =3D RES_SUCCESS;
+ con->c_status =3D CSTATUS_SUCCESS;
l2ca_wakeup("l2cap con rsp", con);
=20
#ifdef CONFIG_BLUETOOTH_L2CAP_USE_TIMERS
@@ -1054,7 +1054,7 @@
disable_ertx(con);
#endif
=20
- l2ca_connect_cfm(con, MSGCODE(MSG_LAYER_L2CAP, conrsp->result));
+ l2ca_connect_cfm(con, conrsp->result);
=20
l2ca_wakeup("Got connect rsp neg", con);
=20=09=09=09
@@ -1626,7 +1626,7 @@
} while (con->c_status =3D=3D CSTATUS_RTX_TIMEOUT);
=20=09
=20
- if (con->c_status !=3D RES_SUCCESS) {
+ if (con->c_status !=3D CSTATUS_SUCCESS) {
if(con->c_status =3D=3D CSTATUS_ERTX_TIMEOUT) {
l2ca_disconnect_ind(con);
}
@@ -1641,7 +1641,7 @@
break;
=20=09=09=09
default:=20=20=20
- retval =3D -MSGCODE(MSG_LAYER_L2CAP, con->c_status);
+ retval =3D -MSGCODE(MSG_LAYER_L2CAP, con->c_result);
}
=20=09=09
ENTERSTATE(con, CLOSED);
@@ -3311,7 +3311,7 @@
case 0x1233:
return "TEST-2";
=20
- case 0x4561:
+ case 0x4461:
return "TEST-3";
=20
default:
|
|
From: Anders J. <and...@us...> - 2002-01-24 12:41:33
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
l2cap.c 1.127 1.128=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
* When retrasmitting info requests we should use the same ID.
The diff of the modified file(s):
--- l2cap.c 2002/01/06 17:33:04 1.127
+++ l2cap.c 2002/01/24 12:41:31 1.128
@@ -1959,7 +1959,7 @@
return;
}
=20
- D_TIM(__FUNCTION__ ": current no rtx : %d\n", con->timer.rtx_no);
+ D_TIM(__FUNCTION__ ": current no rtx : %d\n", con->timers.rtx_no);
=20
con->timers.rtx.inuse =3D 0;
=20
@@ -2074,8 +2074,7 @@
=20
/* Don't increment ID if retransmission */
if (con->timers.rtx_no =3D=3D 0)
- cmd->id =3D set_id(con); /* S
-ets sig_id_sent in l2cap_con */
+ cmd->id =3D set_id(con); /* Sets sig_id_sent in l2cap_con =
*/
else
DSYS("RTX, use same ID\n");
=20
@@ -2303,7 +2302,12 @@
memcpy(req->data, opt_data, opt_len);
=20=20=20
cmd->code =3D SIG_ECHOREQ;
- cmd->id =3D get_id();
+
+
+ if (con->timers.rtx_no =3D=3D 0)
+ cmd->id =3D set_id(con); /* Sets sig_id_sent in l2cap_con =
*/
+ else
+ DSYS("RTX, use same ID\n");
=20=20=20
cmd->len =3D cpu_to_le16(opt_len);
=20
|
|
From: Anders J. <and...@us...> - 2002-02-19 19:04:42
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
l2cap.c 1.129 1.130=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
* Disconnect after a succesful echorequest if we initiated the connection.
The diff of the modified file(s):
--- l2cap.c 11 Feb 2002 17:52:38 -0000 1.129
+++ l2cap.c 19 Feb 2002 19:04:41 -0000 1.130
@@ -2846,6 +2846,7 @@
l2cap_con *con;
s32 i, retval =3D 0;
u8 rev_bd[6];
+ int first_conn =3D 0;
=20
D_XMIT("Sending ping\n");
print_data("Ping destination: bd ", bd, 6);
@@ -2859,6 +2860,8 @@
=20
if (con =3D=3D NULL) {
D_STATE(__FUNCTION__ ": create new baseband link\n");
+ first_conn =3D 1;
+=09=09
con =3D create_con(0/* not yet set */,=20
get_cid(), 0/* not yet set */);
if (con =3D=3D NULL) {
@@ -2915,6 +2918,10 @@
if (con->c_status =3D=3D CSTATUS_MAX_NO_RTX) {
/* max number reached, try to disconnect */
retval =3D l2cap_disconnect_req(con);
+ }
+
+ if(first_conn) {
+ lp_disconnect(con->hci_hdl);
}
=20
return retval;
|
|
From: Anders J. <and...@us...> - 2002-03-01 13:30:29
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
l2cap.c 1.131 1.132=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
* Added BNEP to psm2str function.
* Replaced hardcoded values with global defines.
The diff of the modified file(s):
--- l2cap.c 25 Feb 2002 14:08:36 -0000 1.131
+++ l2cap.c 1 Mar 2002 13:30:27 -0000 1.132
@@ -3323,23 +3323,26 @@
const u8* psm2str(u16 psm)
{
switch (psm) {
- case 1:
+ case SDP_LAYER:
return "SDP";
=20
- case 3:
+ case RFCOMM_LAYER:
return "RFCOMM";
=20
- case 5:
+ case TCS_LAYER:
return "TCS";
=20
- case 0x1231:
+ case L2CAP_TEST_LAYER:
return "TEST";
=20
- case 0x1233:
+ case L2CAP_TEST2_LAYER:
return "TEST-2";
=20
- case 0x4461:
+ case L2CAP_TEST3_LAYER:
return "TEST-3";
+=09=09
+ case BNEP_LAYER:
+ return "BNEP";
=20
default:
return "Unknown";
|
|
From: Willy S. <sag...@us...> - 2002-04-11 10:30:51
|
The following file was modified in linux/drivers/char/bluetooth: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- l2cap.c 1.132 1.133=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Added linux version ifdef for malloc.h/slab.h The diff of the modified file(s): --- l2cap.c 1 Mar 2002 13:30:27 -0000 1.132 +++ l2cap.c 11 Apr 2002 10:17:38 -0000 1.133 @@ -47,7 +47,11 @@ #ifdef __KERNEL__ #include <linux/config.h> #include <linux/bluetooth/sysdep-2.1.h> +#if LINUX_VERSION_CODE >=3D 0x20200 +#include <linux/slab.h> +#else #include <linux/malloc.h> +#endif #include <linux/bluetooth/l2cap.h> #include <linux/bluetooth/hci.h> #include <linux/bluetooth/hci_internal.h> |
Thanks for helping keep SourceForge clean.
X