[B.A.T.M.A.N.] [PATCH 4/5] batman-adv: fix warning in function batadv_v_elp_get_throughput

Simon Wunderlich sw at simonwunderlich.de
Thu Mar 28 16:31:26 CET 2019

From: Anders Roxell <anders.roxell at linaro.org>

When CONFIG_CFG80211 isn't enabled the compiler correcly warns about
'sinfo.pertid' may be unused. It can also happen for other error
conditions that it not warn about.

net/batman-adv/bat_v_elp.c: In function ‘batadv_v_elp_get_throughput.isra.0’:
include/net/cfg80211.h:6370:13: warning: ‘sinfo.pertid’ may be used
 uninitialized in this function [-Wmaybe-uninitialized]

Rework so that we only release '&sinfo' if cfg80211_get_station returns

Fixes: 7d652669b61d ("batman-adv: release station info tidstats")
Signed-off-by: Anders Roxell <anders.roxell at linaro.org>
Signed-off-by: Sven Eckelmann <sven at narfation.org>
Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>
 net/batman-adv/bat_v_elp.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c
index a9b7919c9de5..d5df0114f08a 100644
--- a/net/batman-adv/bat_v_elp.c
+++ b/net/batman-adv/bat_v_elp.c
@@ -104,8 +104,10 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh)
 		ret = cfg80211_get_station(real_netdev, neigh->addr, &sinfo);
-		/* free the TID stats immediately */
-		cfg80211_sinfo_release_content(&sinfo);
+		if (!ret) {
+			/* free the TID stats immediately */
+			cfg80211_sinfo_release_content(&sinfo);
+		}
 		if (ret == -ENOENT) {

More information about the B.A.T.M.A.N mailing list