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

[Fredrik S. <fre...@us...>]

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

Name            Old version     New version     Comment
----            -----------     -----------     -------
bluetooth.c     1.214           1.215=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Added ioctl handling for BNEP, init of BNEP.


The diff of the modified file(s):

--- bluetooth.c	2001/11/22 14:02:41	1.214
+++ bluetooth.c	2001/12/04 12:27:02	1.215
@@ -255,6 +255,14 @@
 void bt_linebuf_send(s32 line);
 #endif
=20
+#ifdef CONFIG_BLUETOOTH_PAN
+void bnep_init(void);
+u32 bnep_connect_req(u8 *bd_addr);
+u32 bnep_test(u8 *p);
+u32 bnep_set_multicast_filter(u8 *filter);
+u32 bnep_set_protocol_filter(u16 *filter);
+#endif
+
 /****************** GLOBAL VARIABLE DECLARATION SECTION ******************=
***/
=20
 extern hci_controller hci_ctrl;
@@ -1174,6 +1182,41 @@
         }
 #endif /* CONFIG_BLUETOOTH_SUPPORT_BCSP */
=20
+#ifdef CONFIG_BLUETOOTH_PAN
+	case BNEPCONNECT:
+	{
+		copy_from_user(&bd_addr, (s32*)arg, size);
+		BT_DRIVER("BNEP connection to %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n",
+			bd_addr[0],bd_addr[1],bd_addr[2],bd_addr[3],bd_addr[4],bd_addr[5]);
+		return bnep_connect_req(bd_addr);
+	}
+
+#ifdef CONFIG_BLUETOOTH_UNPLUG_TEST
+	case BNEPTEST:
+	{
+		s8 temp[5];
+		copy_from_user(&temp, (s32*)arg, size);
+		printk("BNEP TEST %i\n", temp[0]);=20=20=20
+		return bnep_test(&temp[0]);
+	}
+
+	case BNEPADDPROTOCOLFILTER:
+	{
+		u16 temp[2];
+		copy_from_user(&temp, (s32*)arg, size);
+		return bnep_set_protocol_filter(&temp[0]);
+	}
+
+	case BNEPADDMULTICASTFILTER:
+	{
+		u8 temp[12];
+		copy_from_user(&temp, (s32*)arg, size);
+		return bnep_set_multicast_filter(&temp[0]);
+	}
+#endif /* CONFIG_BLUETOOTH_UNPLUG_TEST */
+
+#endif /* CONFIG_BLUETOOTH_PAN */
+
 	default:=09=09
 		return -ENOIOCTLCMD;
 	}
@@ -2608,6 +2651,9 @@
 		rfcomm_init();
 		sdp_init(1); /* For now always init as server */
 		tcs_init();
+#ifdef CONFIG_BLUETOOTH_PAN
+		bnep_init();
+#endif
 		test_init();
 #endif
 	}