31 Jan
2016
31 Jan
'16
4:21 p.m.
Fixes: 5c324517 ("ELP - compute the metric based on the estimated throughput")
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
---
net/batman-adv/bat_v_elp.c | 3 ++-
net/batman-adv/main.h | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c
index f257897..46c6a00 100644
--- a/net/batman-adv/bat_v_elp.c
+++ b/net/batman-adv/bat_v_elp.c
@@ -67,7 +67,8 @@ static void batadv_v_elp_start_timer(struct batadv_hard_iface
*hard_iface)
* batadv_v_elp_get_throughput - get the throughput towards a neighbour
* @neigh: the neighbour for which the throughput has to be obtained
*
- * Return: the throughput towards the given neighbour.
+ * Return: The throughput towards the given neighbour in multiples of 100kpbs
+ * (a value of '10' equals to 1Mbps).
*/
static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh)
{
diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h
index 7b05f68..db45336 100644
--- a/net/batman-adv/main.h
+++ b/net/batman-adv/main.h
@@ -62,7 +62,7 @@
#define BATADV_TQ_TOTAL_BIDRECT_LIMIT 1
/* B.A.T.M.A.N. V */
-#define BATADV_THROUGHPUT_DEFAULT_VALUE 10
+#define BATADV_THROUGHPUT_DEFAULT_VALUE 10 /* 1 Mbps */
#define BATADV_ELP_PROBES_PER_NODE 2
#define BATADV_ELP_MIN_PROBE_SIZE 200 /* bytes */
#define BATADV_ELP_PROBE_MAX_TX_DIFF 100 /* milliseconds */
--
2.7.0
31 Jan
31 Jan
4:21 p.m.
New subject: [B.A.T.M.A.N.] [PATCH next 2/3] batman-adv: convert wifi driver throughput to multiples of 100kbps
Fixes: 5c324517 ("ELP - compute the metric based on the estimated throughput")
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
---
net/batman-adv/bat_v_elp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c
index 46c6a00..461a765 100644
--- a/net/batman-adv/bat_v_elp.c
+++ b/net/batman-adv/bat_v_elp.c
@@ -100,7 +100,7 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node
*neigh)
return 0;
}
if (!ret)
- return sinfo.expected_throughput / 10;
+ return sinfo.expected_throughput / 100;
}
/* unsupported WiFi driver version */
--
2.7.0
1 Feb
1 Feb
12:46 a.m.
New subject: [B.A.T.M.A.N.] [PATCH next 2/3] batman-adv: convert wifi driver throughput to multiples of 100kbps
On Mon, Feb 01, 2016 at 12:21:19AM +0800, Marek Lindner wrote:
Fixes: 5c324517 ("ELP - compute the metric based
on the estimated throughput")
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
Maybe before merging this patch you add a one line commit message here saying
that expected_throughput is supposed to be expressed in kbps, therefore this
fix is required ?
Other than that:
Acked-by: Antonio Quartulli <a(a)unstable.cc>
--
Antonio Quartulli
1:39 a.m.
New subject: [B.A.T.M.A.N.] [PATCH next 2/3] batman-adv: convert wifi driver throughput to multiples of 100kbps
On Monday, February 01, 2016 08:46:23 Antonio Quartulli wrote:
On Mon, Feb 01, 2016 at 12:21:19AM +0800, Marek
Lindner wrote:
As we haven't sent the offending patch upstream yet, you can simply merge all
3 fixes into "ELP - compute the metric based on the estimated throughput" and
be done with it. This patch isn't for stable ...
Cheers,
Marek
Fixes: 5c324517 ("ELP - compute the metric
based on the estimated
throughput")>
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
Maybe before merging this patch you add a one line commit message here
saying that expected_throughput is supposed to be expressed in kbps,
therefore this fix is required ?
2:15 a.m.
New subject: [B.A.T.M.A.N.] [PATCH next 2/3] batman-adv: convert wifi driver throughput to multiples of 100kbps
On Mon, Feb 01, 2016 at 09:39:33AM +0800, Marek Lindner wrote:
On Monday, February 01, 2016 08:46:23 Antonio
Quartulli wrote:
Sure, but I was talking about our repository, just to have a better
understanding of this patch in the future. But if you think we don't need any
description it's fine.
Cheers,
--
Antonio Quartulli
On Mon, Feb 01, 2016 at 12:21:19AM +0800, Marek
Lindner wrote:
As we haven't sent the offending patch upstream yet, you can simply merge all
3 fixes into "ELP - compute the metric based on the estimated throughput" and
be done with it. This patch isn't for stable ... Fixes: 5c324517 ("ELP - compute the metric
based on the estimated
throughput")>
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
Maybe before merging this patch you add a one line commit message here
saying that expected_throughput is supposed to be expressed in kbps,
therefore this fix is required ?
31 Jan
31 Jan
4:21 p.m.
New subject: [B.A.T.M.A.N.] [PATCH next 3/3] batman-adv: fix misleading default throughput warning
The default throughput value represents Mbps and not kbps.
Fixes: 5c324517 ("ELP - compute the metric based on the estimated throughput")
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
---
net/batman-adv/bat_v_elp.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c
index 461a765..2a6a9a2 100644
--- a/net/batman-adv/bat_v_elp.c
+++ b/net/batman-adv/bat_v_elp.c
@@ -129,9 +129,10 @@ static u32 batadv_v_elp_get_throughput(struct
batadv_hardif_neigh_node *neigh)
default_throughput:
if (!(hard_iface->bat_v.flags & BATADV_WARNING_DEFAULT)) {
batadv_info(hard_iface->soft_iface,
- "WiFi driver or ethtool info does not provide information about link speeds
on interface %s, therefore defaulting to hardcoded throughput values of %d kbit/s.
Consider overriding the throughput manually or checking your driver.\n",
+ "WiFi driver or ethtool info does not provide information about link speeds
on interface %s, therefore defaulting to hardcoded throughput values of %u.%1u Mbps.
Consider overriding the throughput manually or checking your driver.\n",
hard_iface->net_dev->name,
- BATADV_THROUGHPUT_DEFAULT_VALUE / 10);
+ BATADV_THROUGHPUT_DEFAULT_VALUE / 10,
+ BATADV_THROUGHPUT_DEFAULT_VALUE % 10);
hard_iface->bat_v.flags |= BATADV_WARNING_DEFAULT;
}
--
2.7.0
1 Feb
1 Feb
12:48 a.m.
New subject: [B.A.T.M.A.N.] [PATCH next 3/3] batman-adv: fix misleading default throughput warning
On Mon, Feb 01, 2016 at 12:21:20AM +0800, Marek Lindner wrote:
The default throughput value represents Mbps and not
kbps.
Isn't this a bit confusing? The default throughput is expressed in multiples of
100kbps, not Mbps.
the rest looks good:
Acked-by: Antonio Quartulli <a(a)unstable.cc>
--
Antonio Quartulli
1:44 a.m.
New subject: [B.A.T.M.A.N.] [PATCH next 3/3] batman-adv: fix misleading default throughput warning
On Monday, February 01, 2016 08:48:26 Antonio Quartulli wrote:
On Mon, Feb 01, 2016 at 12:21:20AM +0800, Marek
Lindner wrote:
Prior to my patch the debug message said:
"[..] therefore defaulting to hardcoded throughput values of 1 kbit/s."
With the patch it says:
"[..] therefore defaulting to hardcoded throughput values of 1.0 Mbps."
FYI, I changed the text to "Mbps" because that is what batman-adv prints in
the neighbor table as well in the originator table.
Cheers,
Marek
The default throughput value represents Mbps and
not kbps.
Isn't this a bit confusing? The default throughput is expressed in multiples
of 100kbps, not Mbps.
2:46 a.m.
New subject: [B.A.T.M.A.N.] [PATCH next 3/3] batman-adv: fix misleading default throughput warning
On Mon, Feb 01, 2016 at 09:44:39AM +0800, Marek Lindner wrote:
On Monday, February 01, 2016 08:48:26 Antonio
Quartulli wrote:
The patch is fixing the way you interpret the BATADV_THROUGHPUT_DEFAULT_VALUE
constant, therefore I expected that with "The default throughput value
represents Mbps" you were stating how to properly interpret such constant (and
this wouldn't be correct).
Cheers,
--
Antonio Quartulli
On Mon, Feb 01, 2016 at 12:21:20AM +0800, Marek
Lindner wrote:
Prior to my patch the debug message said:
"[..] therefore defaulting to hardcoded throughput values of 1 kbit/s."
With the patch it says:
"[..] therefore defaulting to hardcoded throughput values of 1.0 Mbps."
FYI, I changed the text to "Mbps" because that is what batman-adv prints in
the neighbor table as well in the originator table. The default throughput value represents Mbps and
not kbps.
Isn't this a bit confusing? The default throughput is expressed in multiples
of 100kbps, not Mbps.
12:44 a.m.
On Mon, Feb 01, 2016 at 12:21:18AM +0800, Marek Lindner wrote:
Fixes: 5c324517 ("ELP - compute the metric based
on the estimated throughput")
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
Acked-by: Antonio Quartulli <a(a)unstable.cc>
--
Antonio Quartulli
2679
days inactive
2680
days old
b.a.t.m.a.n@lists.open-mesh.org
9 comments
2 participants
participants (2)
-
Antonio Quartulli -
Marek Lindner