Skip to contentSkip to conversation

batman-adv: permit setting ogm interval to JITTER*2

PATCH In review Linus Lüssing 2 participants 3 messages Jun 18, 2010 – Jun 19, 2010

lore
Share & tools
lore

Linus Lüssing

author
#0 lore raw

PATCH 1/1 batman-adv: permit setting ogm interval to JITTER*2

When trying to set the originator interval to 40ms, we are asked to set it to a minimum value of 40ms. This patch permits setting an originator interval of JITTER*20 (40ms by default) now.

Signed-off-by Linus Lüssing <[email protected]>
---
 bat_sysfs.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
bat_sysfs.c +1 -1
index 05703c1..68ce453 100644
@@ -259,7 +259,7 @@ static ssize_t store_orig_interval(struct kobject *kobj, struct attribute *attr,
 		return -EINVAL;
 	}
 
-	if (orig_interval_tmp <= JITTER * 2) {
+	if (orig_interval_tmp < JITTER * 2) {
 		printk(KERN_INFO "batman-adv:New originator interval too small: %li (min: %i)\n",
 		       orig_interval_tmp, JITTER * 2);
 		return -EINVAL;
Signature · 1 line
1.7.1
#1 lore raw

Thanks Linus, applied in r1701.

Quoted 26 lines · Linus Lüssing

When trying to set the originator interval to 40ms, we are asked to set it to a minimum value of 40ms. This patch permits setting an originator interval of JITTER*20 (40ms by default) now.

Signed-off-by Linus Lüssing <[email protected]>
---
 bat_sysfs.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
bat_sysfs.c +1 -1
index 05703c1..68ce453 100644
@@ -259,7 +259,7 @@ static ssize_t store_orig_interval(struct kobject *kobj, struct attribute *attr,
 		return -EINVAL;
 	}
 
-	if (orig_interval_tmp <= JITTER * 2) {
+	if (orig_interval_tmp < JITTER * 2) {
 		printk(KERN_INFO "batman-adv:New originator interval too small: %li (min: %i)\n",
 		       orig_interval_tmp, JITTER * 2);
 		return -EINVAL;
Signature · 1 line
1.7.1
#2 lore raw
In reply to Linus Lüssing

Guess i forgot to mention that your patch was applied in r1701. :)

Thank you,
Simon

Quoted 26 lines · Linus Lüssing

When trying to set the originator interval to 40ms, we are asked to set it to a minimum value of 40ms. This patch permits setting an originator interval of JITTER*20 (40ms by default) now.

Signed-off-by Linus Lüssing <[email protected]>
---
 bat_sysfs.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
bat_sysfs.c +1 -1
index 05703c1..68ce453 100644
@@ -259,7 +259,7 @@ static ssize_t store_orig_interval(struct kobject *kobj, struct attribute *attr,
 		return -EINVAL;
 	}
 
-	if (orig_interval_tmp <= JITTER * 2) {
+	if (orig_interval_tmp < JITTER * 2) {
 		printk(KERN_INFO "batman-adv:New originator interval too small: %li (min: %i)\n",
 		       orig_interval_tmp, JITTER * 2);
 		return -EINVAL;
Signature · 1 line
1.7.1