Linux Headquarters - Kernel v2.6.25-rc7 /net/irda/irlmp

Kernel v2.6.25-rc7 /net/irda/irlmp_event.c

Filename:	/net/irda/irlmp_event.c
Lines Added:	1
Lines Deleted:	3
Also changed in:	(Previous) 2.6.25-rc6 2.6.25-rc5 2.6.25-rc4 2.6.25-rc3 2.6.25-rc2 2.6.25-rc1 (Following) 2.6.25-rc8 2.6.25-rc9 2.6.25 2.6.25-git2 2.6.25-git3 2.6.25-git4

Location

2.6.25-rc7

net

irda

irlmp_event.c

Patch

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

Comments: webmaster (at) linuxhq.com.
Advertising: banners (at) linuxhq.com.
Compilation ©1998-2008 Linux Headquarters, Inc.