diff -u -p linux/include/net/irda/discovery.d1.h linux/include/net/irda/discovery.h
--- linux/include/net/irda/discovery.d1.h	Wed Jun 12 10:55:58 2002
+++ linux/include/net/irda/discovery.h	Wed Jun 12 10:56:42 2002
@@ -38,7 +38,7 @@
 #include <net/irda/irqueue.h>		/* irda_queue_t */
 #include <net/irda/irlap_event.h>	/* LAP_REASON */
 
-#define DISCOVERY_EXPIRE_TIMEOUT 6*HZ
+#define DISCOVERY_EXPIRE_TIMEOUT (2*sysctl_discovery_timeout*HZ)
 #define DISCOVERY_DEFAULT_SLOTS  0
 
 /*