From: Johannes Berg <johannes@sipsolutions.net>
Date: Sat, 23 Feb 2008 14:17:20 +0000 (+0100)
Subject: mac80211: mesh hwmp locking fixes
X-Git-Tag: v2.6.26-rc1~1138^2~454^2~72
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=dc0b0f7d1e34b797b98e4d16122b3ea6f775154c;p=karo-tx-linux.git

mac80211: mesh hwmp locking fixes

This fixes missing unlocks noticed by sparse.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c
index 9a501aae48eb..c2f40ef418cf 100644
--- a/net/mac80211/mesh_hwmp.c
+++ b/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;