diff options
| author | Ross Burton <ross@openedhand.com> | 2008-01-23 03:27:53 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-29 00:10:54 +0100 |
| commit | 91cde6f7d295a9eafea51d821f6e609288736c79 (patch) | |
| tree | 8465492a91f93aad746437468510aed76e421c53 /net/irda/irlmp.c | |
| parent | ath5k: always extend rx timestamp with tsf (diff) | |
| download | linux-91cde6f7d295a9eafea51d821f6e609288736c79.tar.xz linux-91cde6f7d295a9eafea51d821f6e609288736c79.zip | |
[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.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/irda/irlmp.c b/net/irda/irlmp.c index f24cb755908e..135ac6907bbf 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; } |