diff -u -p linux/include/net/irda/discovery.d1.h linux/include/net/irda/discovery.h
--- linux/include/net/irda/discovery.d1.h	Mon Aug  5 16:00:23 2002
+++ linux/include/net/irda/discovery.h	Mon Aug  5 16:00:28 2002
@@ -36,7 +36,7 @@
 #include <net/irda/irda.h>
 #include <net/irda/irqueue.h>
 
-#define DISCOVERY_EXPIRE_TIMEOUT 6*HZ
+#define DISCOVERY_EXPIRE_TIMEOUT (2*sysctl_discovery_timeout*HZ)
 #define DISCOVERY_DEFAULT_SLOTS  0
 
 /* Types of discovery */