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

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

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

Name            Old version     New version     Comment
----            -----------     -----------     -------
sdp.c           1.83            1.84=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:


* Make sure we don't send another configure request as long we have an outs=
tanding one.


The diff of the modified file(s):

--- sdp.c	2001/11/15 11:20:26	1.83
+++ sdp.c	2002/01/15 11:02:28	1.84
@@ -541,7 +541,7 @@
 		/*-----------------------------------------------------------*/
 		bt_register_sdp(sdp->line, sdp->id);
=20
-		if (!l2ca_local_conf_done(l2cap)) {
+		if (!l2ca_local_conf_done(l2cap) && !l2cap->conf_req_sent) {
 			/* still haven't sent config request yet */
 			if (l2ca_config_req(l2cap, 0, NULL, 0, 0)) {
 				D_ERR(__FUNCTION__ " Configuration request failed\n");
@@ -580,7 +580,7 @@
=20
 	/* check if we received a pos response on a=20
 	   previous config req */=20
-	if (!l2ca_local_conf_done(l2cap)) {
+	if (!l2ca_local_conf_done(l2cap) && !l2cap->conf_req_sent) {
 		/* FIXME -- use real options not static values */
=20=09=09
 		if (l2ca_config_req(l2cap, 0, NULL, 0, 0)) {