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

[Anders J. <and...@us...>]

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

Name            Old version     New version     Comment
----            -----------     -----------     -------
bluetooth.c     1.216           1.217=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:


* Made GETINFO work.


The diff of the modified file(s):

--- bluetooth.c	2001/12/07 17:45:06	1.216
+++ bluetooth.c	2002/01/06 19:49:40	1.217
@@ -50,7 +50,6 @@
 #include <linux/sched.h>
 #include <linux/delay.h>
 #include <linux/timer.h>
-
 /* Make sure KERNEL_VERSION() is defined */
 #ifndef KERNEL_VERSION
 #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
@@ -1066,11 +1065,13 @@
 	case BTGETINFO:
 	{
 		u8 bd[6];
-		u16 type;
+		u8 tmp[2];
+		u16 type =3D 0;
=20
 		/* first byte contains length of whole hci message */
 		copy_from_user(&bd, (u8*)arg, 6);
-		copy_from_user(&type, (u8*)arg + 6, 2);
+		copy_from_user(&tmp, (u8*)arg + 6, 2);
+		type =3D ((tmp[0] << 8) & 0xff00) | (tmp[1] & 0xff);
=20
 		BT_DRIVER("BTGETINFO: Type %d\n", type);
=20