Menu
▾
▴
CVS: 5 files have been modified in linux/drivers/char/bluetooth.
|
From: Peter K. <pk...@us...> - 2001-03-05 15:51:16
|
The following files were modified in linux/drivers/char/bluetooth:
Name Old version New version Comment
---- ----------- ----------- -------
Config.in 1.4 1.5=20=20=20=20=20=20=20=20=20=20=20=20=20
bluetooth.c 1.135 1.136=20=20=20=20=20=20=20=20=20=20=20
l2cap.c 1.88 1.89=20=20=20=20=20=20=20=20=20=20=20=20
rfcomm.c 1.91 1.92=20=20=20=20=20=20=20=20=20=20=20=20
sec_client.c 1.12 1.13=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Made it possible to configure the use of a Security Manager and
TCI using the kernel configuration.
The diff of the modified file(s):
--- Config.in 2001/03/05 15:39:07 1.4
+++ Config.in 2001/03/05 15:52:52 1.5
@@ -10,8 +10,10 @@
=20
bool ' Bluetooth proc entries' CONFIG_BLUETOOTH_PROC
bool ' Input buffering' CONFIG_BLUETOOTH_USE_INBUFFER
+ bool ' Use Security Manager' CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
bool ' Use L2CAP timers' CONFIG_BLUETOOTH_L2CAP_USE_TIMERS
bool ' Allow connectionless L2CAP' CONFIG_BLUETOOTH_L2CAP_CONNECTIONLESS
+ bool ' Enable TCI' CONFIG_BLUETOOTH_USE_TCI
=20
choice ' Bluetooth hardware type' \
"None CONFIG_BLUETOOTH_NOINIT \
--- bluetooth.c 2001/03/05 15:39:07 1.135
+++ bluetooth.c 2001/03/05 15:52:52 1.136
@@ -60,7 +60,7 @@
#include <linux/bluetooth/tcs.h>
#include <linux/bluetooth/sdp.h>
#include <linux/bluetooth/sec_client.h>
-#ifdef USE_TCI
+#ifdef CONFIG_BLUETOOTH_USE_TCI
#include <linux/bluetooth/tci.h>
#endif
=20
@@ -2007,7 +2007,7 @@
procfs_status);
}
=20
-#ifdef USE_SECURITY_MANAGER
+#ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
#ifdef KERNEL_VERSION /* Not defined for kernel 2.0.x */
#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
{
@@ -2039,7 +2039,7 @@
D_ERR("Couldn't register proc file for security manager %d\n",
procfs_status);
}
-#endif /* USE_SECURITY_MANAGER */
+#endif /* CONFIG_BLUETOOTH_USE_SECURITY_MANAGER */
=20
#ifdef KERNEL_VERSION /* Not defined for kernel 2.0.x */
#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
@@ -2066,7 +2066,7 @@
procfs_status);
}
=20
-#ifdef USE_TCI
+#ifdef CONFIG_BLUETOOTH_USE_TCI
#ifdef KERNEL_VERSION /* Not defined for kernel 2.0.x */
#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,4,0)
{
@@ -2090,7 +2090,7 @@
D_ERR("Couldn't register proc file for tci database %d\n",
procfs_status);
}
-#endif /* USE_TCI */
+#endif /* CONFIG_BLUETOOTH_USE_TCI */
=20=09
#endif /* CONFIG_BLUETOOTH_PROC */
=20
@@ -2146,7 +2146,7 @@
hci_init();
l2cap_init();
=20
-#ifdef USE_TCI
+#ifdef CONFIG_BLUETOOTH_USE_TCI
tci_init();
#else
rfcomm_init();
@@ -2653,23 +2653,23 @@
remove_proc_entry(bt_internal_info.name, &proc_root);
remove_proc_entry(sdp_proc_entry.name, &proc_root);
remove_proc_entry(bt_proc_doit.name, &proc_root);
-#ifdef USE_SECURITY_MANAGER
+#ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
remove_proc_entry(sec_man_proc_entry.name, &proc_root);
-#endif /* USE_SECURITY_MANAGER */
-#ifdef USE_TCI
+#endif /* CONFIG_BLUETOOTH_USE_SECURITY_MANAGER */
+#ifdef CONFIG_BLUETOOTH_USE_TCI
remove_proc_entry(tci_proc_entry.name, &proc_root);
-#endif /* USE_TCI */
+#endif /* CONFIG_BLUETOOTH_USE_TCI */
#else
proc_unregister(&proc_root, bt_status.low_ino);
proc_unregister(&proc_root, bt_internal_info.low_ino);
proc_unregister(&proc_root, sdp_proc_entry.low_ino);
proc_unregister(&proc_root, bt_proc_doit.low_ino);
-#ifdef USE_SECURITY_MANAGER
+#ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
proc_unregister(&proc_root, sec_man_proc_entry.low_ino);
-#endif /* USE_SECURITY_MANAGER */
-#ifdef USE_TCI
+#endif /* CONFIG_BLUETOOTH_USE_SECURITY_MANAGER */
+#ifdef CONFIG_BLUETOOTH_USE_TCI
proc_unregister(&proc_root, tci_proc_entry.low_ino);
-#endif /* USE_TCI */
+#endif /* CONFIG_BLUETOOTH_USE_TCI */
#endif /* LINUX_VERSION_CODE */
#endif /* CONFIG_BLUETOOTH_PROC */
=20=09
--- l2cap.c 2001/03/05 15:39:07 1.88
+++ l2cap.c 2001/03/05 15:52:52 1.89
@@ -307,7 +307,7 @@
#endif /* LINUX_VERSION_CODE */
#endif /* __KERNEL__ */
=20
-#ifdef USE_SECURITY_MANAGER
+#ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
/* Initialize security */
l2cap_sec_man_init();
#endif
@@ -713,7 +713,7 @@
con->conf_req_ready=3DFALSE;
con->conf_rsp_ready=3DFALSE;
=20
-#ifdef USE_SECURITY_MANAGER=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20
+#ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20
l2cap_check_allowed_security(con->psm, con->remote_bd, con=
);
#else
l2ca_connect_ind(con);
--- rfcomm.c 2001/03/02 21:52:15 1.91
+++ rfcomm.c 2001/03/05 15:52:52 1.92
@@ -484,7 +484,7 @@
rpn_val.xoff_u8 =3D 0x13;
memset(&rpn_val.pm, 0 , 2); /* Set the mask to zero */
=20=20=20=20=20=20=20=20=20
-#ifdef USE_SECURITY_MANAGER
+#ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
rfcomm_sec_man_init();
#endif
}
@@ -924,7 +924,7 @@
D_REC(FNC"setting server channel %d\n",
short_pkt->h.addr.server_chn);
=20
-#ifdef USE_SECURITY_MANAGER
+#ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
rfcomm_check_allowed_security(rfcomm->l2cap->remot=
e_bd,
tmp_dlci, rfcomm);
#else
@@ -949,7 +949,7 @@
D_CTRL(FNC"sending back UA - other channel\n");
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20
send_ua(rfcomm, tmp_dlci);
-#endif /* USE_SECURITY_MANAGER */
+#endif /* CONFIG_BLUETOOTH_USE_SECURITY_MANAGER */
} else {
=20
D_CTRL(FNC"no server on channel %d, sending DM\n",
--- sec_client.c 2001/03/03 15:33:00 1.12
+++ sec_client.c 2001/03/05 15:52:52 1.13
@@ -282,8 +282,9 @@
__FILE__, __LINE__);
=20
/* *** NOTE ***=20
- * define USE_SECURITY_MANAGER to 0 in btconfig.h if you=20
- * don't know what this is...
+ * Make sure CONFIG_BLUETOOTH_USE_SECURITY_MANAGER is
+ * undefined (either in kernel configuration or in btconfig.h)
+ * if you don't know what this is...
*/
=20
}
|
