[IrDA]: LMP discovery timer not started by default

By default, LMP sets up a 3 seconds timer for discovery.
We don't need it until discovery is set to 1.

Signed-off-by: Ross Burton <ross@openedhand.com>
Signed-off-by: Samuel Ortiz <samuel@sortiz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 3 deletions

diff --git a/net/irda/irlmp_event.c b/net/irda/irlmp_event.c
index 1bba87e78609..150cd3f1129a 100644
--- 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);