CVS: The file 'linux/drivers/char/bluetooth/hci.c' has been modified.

[Peter K. <pk...@us...>]

The following file was modified in linux/drivers/char/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
hci.c           1.122           1.123=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Added checks for CONFIG_BLUETOOTH_USE_SECURITY_MANAGER around
all calls to sec_man_event().


The diff of the modified file(s):

--- hci.c	2001/03/02 21:52:15	1.122
+++ hci.c	2001/03/05 16:42:57	1.123
@@ -731,13 +731,14 @@
=20
 	case AUTHENTICATION_COMPLETE:
 		DSYS(__FUNCTION__", AUTHENTICATION_COMPLETE\n");
+#ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
 		if (buf[0]) {
 			D_ERR(__FUNCTION__", AUTHENTICATION_COMPLETE: %s\n", get_err_msg(buf[0]=
));
=20=09=09=09
 		}
=20=09=09
 		sec_man_event(HCI, get_bd(CHAR2INT12(buf[2], buf[1])), AUTHENTICATION_CO=
MPLETE, buf, 1);
-=09=09
+#endif
 		break;
=20
 	case REMOTE_NAME_REQUEST_COMPLETE:
@@ -755,19 +756,21 @@
 		break;
=20
 	case ENCRYPTION_CHANGE:
-	{
-		u8 tmp[2];
 		DSYS(__FUNCTION__", ENCRYPTION_CHANGE\n");
+#ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
 		if (buf[0]) {
 			D_ERR(__FUNCTION__", ENCRYPTION_CHANGE: %s\n", get_err_msg(buf[0]));
 		}
=20
+                {
+                        u8 tmp[2];
 		tmp[0] =3D buf[0];
 		tmp[1] =3D buf[4];
=20=09=09
 		sec_man_event(HCI, get_bd(CHAR2INT12(buf[2], buf[1])), ENCRYPTION_CHANGE=
, tmp, 2);
-		break;
 	}
+#endif
+		break;
=20=09
 	case CHANGE_CONNECTION_LINK_KEY_COMPLETE:
 		DSYS(__FUNCTION__", CHANGE_CONNECTION_LINK_KEY_COMPLETE Not implemented!=
\n");
@@ -855,9 +858,10 @@
 		break;
=20
 	case RETURN_LINK_KEYS:
+		D_CMD(__FUNCTION__", RETURN_LINK_KEYS event\n");
+#ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
 	{
 		u8 tmp_str[23];
-		D_CMD(__FUNCTION__", RETURN_LINK_KEYS event\n");
=20=09=09
 		for (i =3D 0; i < buf[0]; i++) {
 			D_CMD("%d: ",i);
@@ -866,24 +870,29 @@
 			memcpy(tmp_str + 7, (buf + 1) + (buf[0] * 6) + (i * 16), 16);
 			sec_man_event(HCI, buf + 1, RETURN_LINK_KEYS, tmp_str, 17);
 		}
-=09=09
-		break;
 	}
+#endif
+		break;
=20=09
 	case PIN_CODE_REQUEST:
 		D_CMD(__FUNCTION__", PIN_CODE_REQUEST forwarding event to security manag=
er\n");
+#ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
 		sec_man_event(HCI, buf, PIN_CODE_REQUEST, NULL, 0);
+#endif
 		break;
=20=09
 	case LINK_KEY_REQUEST:
-=09
 		D_CMD(__FUNCTION__", LINK_KEY_REQUEST\n");
+#ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
 		sec_man_event(HCI, buf, LINK_KEY_REQUEST, NULL, 0);
+#endif
 		break;
=20
 	case LINK_KEY_NOTIFICATION:
 		D_CMD(__FUNCTION__", LINK_KEY_NOTIFICATION forwarding event to security =
manager\n");
+#ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
 		sec_man_event(HCI, buf, LINK_KEY_NOTIFICATION, buf + 6, 16);
+#endif
 		break;
=20
 	case LOOPBACK_COMMAND: