openbt-commit

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

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

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

Name            Old version     New version     Comment
----            -----------     -----------     -------
bcsp_mux.c      1.3             1.4=20=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Do not include stdio.h


The diff of the modified file(s):

--- bcsp_mux.c	2001/05/17 15:55:00	1.3
+++ bcsp_mux.c	2001/05/18 15:18:17	1.4
@@ -41,8 +41,8 @@
=20
 /****************** INCLUDE FILES SECTION ********************************=
***/
=20
-#include <stdio.h>
 #include <linux/malloc.h>
+
 #include <linux/bluetooth/bcsp.h>
 #include <linux/bluetooth/bcsp_debug.h>
=20

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

[Mats F. <ma...@us...>]

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

Name            Old version     New version     Comment
----            -----------     -----------     -------
bcsp_mux.c      1.5             1.6=20=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Signal rxack when receiving data packets too


The diff of the modified file(s):

--- bcsp_mux.c	2001/05/18 16:03:51	1.5
+++ bcsp_mux.c	2001/05/25 14:10:26	1.6
@@ -69,9 +69,11 @@
 {
 	/* If we received an ack packet, we discard the packet, sice the ack
 	   has already been handled by signal_rxack */
+
+	bcsp_signal_rxack(BCSP_GET_ACK(bcsp));
+=09
 	if (bcsp->identifier =3D=3D 0) {
 		D(__FUNCTION__ ": Received ack, returning\n");
-		bcsp_signal_rxack(BCSP_GET_ACK(bcsp));
 		return 0;
 	}
=20=09

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

[Mats F. <ma...@us...>]

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

Name            Old version     New version     Comment
----            -----------     -----------     -------
bcsp_mux.c      1.7             1.8=20=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

If it isn't an ack-packet, we shouldn't signal an ack here. Ack sent in dat=
a packets
are taken care of in the sequence-layer.


The diff of the modified file(s):

--- bcsp_mux.c	2001/05/30 09:47:00	1.7
+++ bcsp_mux.c	2001/07/20 06:41:00	1.8
@@ -72,10 +72,9 @@
 	/* If we received an ack packet, we discard the packet, sice the ack
 	   has already been handled by signal_rxack */
=20
-	bcsp_signal_rxack(BCSP_GET_ACK(bcsp));
-=09
 	if (bcsp->identifier =3D=3D 0) {
 		D(__FUNCTION__ ": Received ack, returning\n");
+		bcsp_signal_rxack(BCSP_GET_ACK(bcsp));
 		return 0;
 	}
=20=09

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

[Willy S. <sag...@us...>]

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

Name        Old version  New version  Tag  Comment
----        -----------  -----------  ---  -------
bcsp_mux.c  1.10         1.11=20=20=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Added linux version ifdef for slab.h/malloc.h


The diff of the modified file(s):

--- bcsp_mux.c	18 Sep 2001 13:04:27 -0000	1.10
+++ bcsp_mux.c	11 Apr 2002 08:34:29 -0000	1.11
@@ -44,8 +44,11 @@
 #define __NO_VERSION__ /* don't define kernel_version in module.h */
=20
 #ifdef __KERNEL__
+#if LINUX_VERSION_CODE >=3D 0x20200
+#include <linux/slab.h>
+#else
 #include <linux/malloc.h>
-
+#endif
 #include <linux/bluetooth/bcsp.h>
 #include <linux/bluetooth/bcsp_debug.h>
 #else