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

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

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

Name            Old version     New version     Comment
----            -----------     -----------     -------
bluetooth.c     1.209           1.210=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Added names for the Bluetooth driver and line discipline
(supported in Linux 2.2 and 2.4).


The diff of the modified file(s):

--- bluetooth.c	2001/10/30 15:04:52	1.209
+++ bluetooth.c	2001/11/08 14:27:01	1.210
@@ -2275,6 +2275,9 @@
=20
 	memset(&bt_driver, 0, sizeof(bt_driver));
 	bt_driver.magic =3D BT_TTY_DRIVER_MAGIC;
+#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,2,0)
+	bt_driver.driver_name =3D "bluetooth";
+#endif
 	bt_driver.name =3D "ttyBT";
 	bt_driver.major =3D BT_TTY_MAJOR;
 	bt_driver.minor_start =3D 0;
@@ -2327,6 +2330,9 @@
=20=09
 	memset(&bt_ldisc, 0, sizeof(bt_ldisc));
 	bt_ldisc.magic		=3D TTY_LDISC_MAGIC;
+#if LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,2,0)
+	bt_ldisc.name		=3D "n_bt";
+#endif
 	bt_ldisc.open		=3D bt_tty_open;
 	bt_ldisc.close		=3D bt_tty_close;
 	bt_ldisc.read		=3D bt_tty_read;
@@ -2337,8 +2343,8 @@
 #else
 	bt_ldisc.poll  	        =3D bt_tty_poll;
 #endif
-	bt_ldisc.receive_room	=3D bt_tty_room;
 	bt_ldisc.receive_buf	=3D bt_receive_lower_stack;
+	bt_ldisc.receive_room	=3D bt_tty_room;
 	bt_ldisc.write_wakeup	=3D bt_tty_wakeup;
=20=09
 	status =3D tty_register_ldisc(N_BT, &bt_ldisc);