From 91cde6f7d295a9eafea51d821f6e609288736c79 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 22 Jan 2008 18:27:53 -0800 Subject: [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 Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller --- net/irda/irlmp.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'net/irda/irlmp.c') diff --git a/net/irda/irlmp.c b/net/irda/irlmp.c index f24cb755908..135ac6907bb 100644 --- a/net/irda/irlmp.c +++ b/net/irda/irlmp.c @@ -103,9 +103,12 @@ int __init irlmp_init(void) irlmp->last_lsap_sel = 0x0f; /* Reserved 0x00-0x0f */ strcpy(sysctl_devname, "Linux"); - /* Do discovery every 3 seconds */ init_timer(&irlmp->discovery_timer); - irlmp_start_discovery_timer(irlmp, sysctl_discovery_timeout*HZ); + + /* Do discovery every 3 seconds, conditionaly */ + if (sysctl_discovery) + irlmp_start_discovery_timer(irlmp, + sysctl_discovery_timeout*HZ); return 0; } -- cgit v1.2.3