From a7e7933b4e90d3221c90611a4d70f5bfbff99737 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross@openedhand.com>
Date: Tue, 22 Jan 2008 18:27:53 -0800
Subject: [PATCH] --- yaml --- r: 79502 b: refs/heads/master c:
 91cde6f7d295a9eafea51d821f6e609288736c79 h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/net/irda/irlmp.c       |  7 +++++--
 trunk/net/irda/irlmp_event.c |  4 +---
 trunk/net/irda/irsysctl.c    | 28 +++++++++++++++++++++++++++-
 4 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 6f3a4ecd368a..364e788777f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0e1899bdbd5e997d2256fcc23fc4e3d2bc5f811
+refs/heads/master: 91cde6f7d295a9eafea51d821f6e609288736c79
diff --git a/trunk/net/irda/irlmp.c b/trunk/net/irda/irlmp.c
index f24cb755908e..135ac6907bbf 100644
--- a/trunk/net/irda/irlmp.c
+++ b/trunk/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;
 }
diff --git a/trunk/net/irda/irlmp_event.c b/trunk/net/irda/irlmp_event.c
index 1bba87e78609..150cd3f1129a 100644
--- a/trunk/net/irda/irlmp_event.c
+++ b/trunk/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);
diff --git a/trunk/net/irda/irsysctl.c b/trunk/net/irda/irsysctl.c
index d8aba869ff11..9ab3df15425d 100644
--- a/trunk/net/irda/irsysctl.c
+++ b/trunk/net/irda/irsysctl.c
@@ -29,6 +29,8 @@
 #include <linux/init.h>
 
 #include <net/irda/irda.h>		/* irda_debug */
+#include <net/irda/irlmp.h>
+#include <net/irda/timer.h>
 #include <net/irda/irias_object.h>
 
 extern int  sysctl_discovery;
@@ -45,6 +47,8 @@ extern int  sysctl_max_noreply_time;
 extern int  sysctl_warn_noreply_time;
 extern int  sysctl_lap_keepalive_time;
 
+extern struct irlmp_cb *irlmp;
+
 /* this is needed for the proc_dointvec_minmax - Jean II */
 static int max_discovery_slots = 16;		/* ??? */
 static int min_discovery_slots = 1;
@@ -85,6 +89,27 @@ static int do_devname(ctl_table *table, int write, struct file *filp,
 	return ret;
 }
 
+
+static int do_discovery(ctl_table *table, int write, struct file *filp,
+                    void __user *buffer, size_t *lenp, loff_t *ppos)
+{
+       int ret;
+
+       ret = proc_dointvec(table, write, filp, buffer, lenp, ppos);
+       if (ret)
+	       return ret;
+
+       if (irlmp == NULL)
+	       return -ENODEV;
+
+       if (sysctl_discovery)
+	       irlmp_start_discovery_timer(irlmp, sysctl_discovery_timeout*HZ);
+       else
+	       del_timer_sync(&irlmp->discovery_timer);
+
+       return ret;
+}
+
 /* One file */
 static ctl_table irda_table[] = {
 	{
@@ -93,7 +118,8 @@ static ctl_table irda_table[] = {
 		.data		= &sysctl_discovery,
 		.maxlen		= sizeof(int),
 		.mode		= 0644,
-		.proc_handler	= &proc_dointvec
+		.proc_handler	= &do_discovery,
+		.strategy       = &sysctl_intvec
 	},
 	{
 		.ctl_name	= NET_IRDA_DEVNAME,