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

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

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

Name            Old version     New version     Comment
----            -----------     -----------     -------
bluetooth.c     1.151           1.152=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Always use HZ when setting times relative to jiffies.


The diff of the modified file(s):

--- bluetooth.c	2001/03/19 12:37:42	1.151
+++ bluetooth.c	2001/03/19 17:00:26	1.152
@@ -161,7 +161,8 @@
 /****************** LOCAL FUNCTION DECLARATION SECTION *******************=
***/
=20
 #ifdef __CRIS__
-#define BT_FLASH_LED_TIME 2 /* jiffies */
+#define BT_FLASH_LED_TIME   (HZ/50) /* 20 ms */
+
 static struct timer_list bt_clear_led_timer;
 static int bt_led_clear_time;
 static void bt_clear_led(unsigned long dummy);
@@ -281,7 +282,7 @@
 static tty_linebuffer tty_linebuf;
=20
 static struct timer_list bt_timer;
-#define BT_CON_TIMEOUT 700 /* jiffies */
+#define BT_CON_TIMEOUT (7*HZ)
=20
 /****************** FUNCTION DEFINITION SECTION **************************=
***/
=20
@@ -1836,7 +1837,7 @@
 {
 	if (jiffies > bt_led_clear_time)
 		LED_ACTIVE_SET(0);
-	bt_clear_led_timer.expires =3D jiffies + 10;
+	bt_clear_led_timer.expires =3D jiffies + HZ/10;
 	add_timer(&bt_clear_led_timer);
 }
=20
@@ -2116,7 +2117,7 @@
 	/* start led timer */
         init_timer(&bt_clear_led_timer);
 	bt_clear_led_timer.function =3D &bt_clear_led;
-	bt_clear_led_timer.expires =3D jiffies + 10;
+	bt_clear_led_timer.expires =3D jiffies + HZ/10;
 	add_timer(&bt_clear_led_timer);
 #endif
 }
@@ -2473,9 +2474,11 @@
 			bt->rfcomm =3D NULL;
 		}
 	}
+
 #ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
  	sec_client_shutdown(); /* Inform that stack is getting closed */
 #endif
+
 	rfcomm_close();
 	sdp_shutdown();
 	tcs_shutdown();