From 487721cac09b5d469a4fdfdf9f1828d79b62381a Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Sat, 23 Feb 2008 15:17:20 +0100 Subject: [PATCH] --- yaml --- r: 90073 b: refs/heads/master c: dc0b0f7d1e34b797b98e4d16122b3ea6f775154c h: refs/heads/master i: 90071: d83d11c051347e8be2d53f3953335b822956e56e v: v3 --- [refs] | 2 +- trunk/net/mac80211/mesh_hwmp.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 95becad71b44..4a338a1448ab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 902acc7896d7649fb30e4b22bd4e643c7f34b02c +refs/heads/master: dc0b0f7d1e34b797b98e4d16122b3ea6f775154c diff --git a/trunk/net/mac80211/mesh_hwmp.c b/trunk/net/mac80211/mesh_hwmp.c index 9a501aae48eb..c2f40ef418cf 100644 --- a/trunk/net/mac80211/mesh_hwmp.c +++ b/trunk/net/mac80211/mesh_hwmp.c @@ -264,8 +264,10 @@ static u32 hwmp_route_info_get(struct net_device *dev, rcu_read_lock(); sta = sta_info_get(local, mgmt->sa); - if (!sta) + if (!sta) { + rcu_read_unlock(); return 0; + } last_hop_metric = airtime_link_metric_get(local, sta); /* Update and check originator routing info */ @@ -293,6 +295,7 @@ static u32 hwmp_route_info_get(struct net_device *dev, break; default: sta_info_put(sta); + rcu_read_unlock(); return 0; } new_metric = orig_metric + last_hop_metric;