|
From: Peter K. <pk...@us...> - 2001-02-27 11:31:11
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
rfcomm_sec.c 1.7 1.8=20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Minor clean-up.
The diff of the modified file(s):
--- rfcomm_sec.c 2001/02/26 16:12:17 1.7
+++ rfcomm_sec.c 2001/02/27 11:32:19 1.8
@@ -68,23 +68,18 @@
=20
/****************** DEBUG CONSTANT AND MACRO SECTION *********************=
***/
=20
-
/****************** CONSTANT AND MACRO SECTION ***************************=
***/
=20
-
/****************** TYPE DEFINITION SECTION ******************************=
***/
=20
-
/****************** LOCAL FUNCTION DECLARATION SECTION *******************=
***/
=20
/****************** GLOBAL VARIABLE DECLARATION SECTION ******************=
***/
=20
/****************** LOCAL VARIABLE DECLARATION SECTION *******************=
***/
=20
-
/****************** FUNCTION DEFINITION SECTION **************************=
***/
=20=20=20
-
void=20
rfcomm_sec_man_init(void)
{
@@ -107,7 +102,6 @@
=20=09
switch (result) {
case SECURITY_OK:=20
- {
rfcon->dlci[tmp_dlci].state =3D CONNECTED;
=20
if (valid_dlci(tmp_dlci))
@@ -115,6 +109,7 @@
=20=09=09=09
bt_register_rfcomm(rfcon, tmp_dlci);
bt_connect_cfm(CREATE_RFCOMM_ID(rfcon->line, tmp_dlci), 0 /* status ok*=
/ );=09=09=09
+
#if 0
/* This part was taken from rfcomm.c and should perhaps
reside there */
@@ -139,38 +134,31 @@
printk("rfcomm_process_sec_man_response : invalid dlci [%d]\n", tmp_dlc=
i);
}
break;
- }
+
case UNKNOWN_REQUEST_TYPE:
case UNKNOWN_REQUEST_VALUE:
- {
/* send negative connection response */
rfcon->dlci[tmp_dlci].state =3D DISCONNECTED;
rfcomm_dm_msg(rfcon,tmp_dlci);
-
break;
- }
+
case PSM_SECURITY_BLOCK:
case AUTHENTICATION_FAILURE:
case ENCRYPTION_FAILURE:
- {
/* send negative connection response */
rfcon->dlci[tmp_dlci].state =3D DISCONNECTED;
rfcomm_dm_msg(rfcon,tmp_dlci);
-
break;
- }
+
case GENERAL_FAILURE:
- {
/* send negative connection response */
rfcon->dlci[tmp_dlci].state =3D DISCONNECTED;
rfcomm_dm_msg(rfcon,tmp_dlci);
-
break;
- }
+
default:
- {
/* Print error message */
- }
+ break;
}
}
=20
|