aboutsummaryrefslogtreecommitdiff
path: root/net/irda/irlmp.c
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2008-01-22 18:27:53 -0800
committerDavid S. Miller <davem@davemloft.net>2008-01-28 15:10:54 -0800
commit91cde6f7d295a9eafea51d821f6e609288736c79 (patch)
tree8465492a91f93aad746437468510aed76e421c53 /net/irda/irlmp.c
parentc0e1899bdbd5e997d2256fcc23fc4e3d2bc5f811 (diff)
downloadlinux-91cde6f7d295a9eafea51d821f6e609288736c79.tar.gz
[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>
Diffstat (limited to 'net/irda/irlmp.c')
-rw-r--r--net/irda/irlmp.c7
1 files changed, 5 insertions, 2 deletions
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;
}