The following commit has been merged in the merge/master branch: commit c59b8c70002ec315742a7c4991e574822915f305 Author: Marek Lindner mareklindner@neomailbox.ch Date: Mon Feb 1 14:34:33 2016 +0800
batman-adv: convert wifi driver throughput to multiples of 100kbps
The expected throughout returned by the cfg80211 API is expressed in kbps while internally batman-adv stores multiples of 100kbps. Ensure the conversion is performed properly.
Fixes: 5c324517 ("ELP - compute the metric based on the estimated throughput")
Signed-off-by: Marek Lindner mareklindner@neomailbox.ch
diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index 4654251..0b82c6a 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 */