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  Tag  Comment
----         -----------  -----------  ---  -------
bluetooth.c  1.231        1.232=20=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:


* Added BTDISCONNECT_BB to disconnect the BB based on the BD-address.


The diff of the modified file(s):

--- bluetooth.c	5 Aug 2002 15:38:11 -0000	1.231
+++ bluetooth.c	6 Aug 2002 17:52:14 -0000	1.232
@@ -86,6 +86,7 @@
 #include <linux/bluetooth/hci.h>
 #include <linux/bluetooth/hci_internal.h>
 #include <linux/bluetooth/l2cap.h>
+#include <linux/bluetooth/l2cap_con.h>
 #include <linux/bluetooth/rfcomm.h>
 #include <linux/bluetooth/tcs.h>
 #include <linux/bluetooth/sdp.h>
@@ -620,6 +621,29 @@
 		BT_DRIVER(__FUNCTION__ ": BTDISCONNECT\n");
 		copy_from_user(&con_id, (s32*)arg, size);
 		return bt_disconnect(con_id);
+	}
+
+	case BTDISCONNECT_BB:
+	{
+		/* Disconnect the BB connection (Consafe)=20
+		   The bd_addr is reversed=20
+		*/
+		u8 bd_addr[6];
+		l2cap_con *con_str;
+
+		copy_from_user(bd_addr, (s32*)arg, 6);
+=09=09
+		BT_DRIVER(__FUNCTION__ ": BTDISCONNECT_BT %02x:%02x:%02x:%02x:%02x:%02x:=
\n",=20
+			  bd_addr[0], bd_addr[1], bd_addr[2],
+			  bd_addr[3], bd_addr[4], bd_addr[5]);
+=09=09
+		if ((con_str =3D get_con(bd_addr, ANY_STATE))=3D=3D NULL)=20
+		{
+			D_ERR(__FUNCTION__ ": couldn't find l2cap con!\n");
+			return -MSGCODE(MSG_BT_INTERFACE, BT_NOTCONNECTED);
+		}
+=09=09
+		return lp_disconnect(con_str->hci_hdl);
 	}
=20
 	case BTWAITFORCONNECTION: