| From 0b1a4307d6d4fc01b4f74d2016dac71e542323a9 Mon Sep 17 00:00:00 2001 |
| From: Felix Fietkau <nbd@nbd.name> |
| Date: Fri, 25 Jan 2019 08:21:26 +0100 |
| Subject: batman-adv: release station info tidstats |
| |
| [ Upstream commit 7d652669b61d702c6e62a39579d17f6881670ab6 ] |
| |
| With the addition of TXQ stats in the per-tid statistics the struct |
| station_info grew significantly. This resulted in stack size warnings |
| due to the structure itself being above the limit for the warnings. |
| |
| To work around this, the TID array was allocated dynamically. Also a |
| function to free this content was introduced with commit 7ea3e110f2f8 |
| ("cfg80211: release station info tidstats where needed") but the necessary |
| changes were not provided for batman-adv's B.A.T.M.A.N. V implementation. |
| |
| Signed-off-by: Felix Fietkau <nbd@nbd.name> |
| Fixes: 8689c051a201 ("cfg80211: dynamically allocate per-tid stats for station info") |
| [sven@narfation.org: add commit message] |
| Signed-off-by: Sven Eckelmann <sven@narfation.org> |
| Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| net/batman-adv/bat_v_elp.c | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c |
| index e8090f099eb8..ef0dec20c7d8 100644 |
| --- a/net/batman-adv/bat_v_elp.c |
| +++ b/net/batman-adv/bat_v_elp.c |
| @@ -104,6 +104,9 @@ 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); |
| + |
| dev_put(real_netdev); |
| if (ret == -ENOENT) { |
| /* Node is not associated anymore! It would be |
| -- |
| 2.19.1 |
| |
