[IrDA]: LMP discovery timer not started by default

[linux-2.6-omap-h63xx.git] / net / irda / irlmp_event.c

diff --git a/net/irda/irlmp_event.c b/net/irda/irlmp_event.c
index 1bba87e7860943ac444d6f55b4aa78fa8c5dad30..150cd3f1129aeb833ad19638adbae35d2946c305 100644 (file)
--- a/net/irda/irlmp_event.c
+++ b/net/irda/irlmp_event.c
@@ -174,9 +174,7 @@ void irlmp_discovery_timer_expired(void *data)
        /* We always cleanup the log (active & passive discovery) */
        irlmp_do_expiry();
 
-       /* Active discovery is conditional */
-       if (sysctl_discovery)
-               irlmp_do_discovery(sysctl_discovery_slots);
+       irlmp_do_discovery(sysctl_discovery_slots);
 
        /* Restart timer */
        irlmp_start_discovery_timer(irlmp, sysctl_discovery_timeout * HZ);