Commit dc0b0f7d authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville

mac80211: mesh hwmp locking fixes

This fixes missing unlocks noticed by sparse.
Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 902acc78
...@@ -264,8 +264,10 @@ static u32 hwmp_route_info_get(struct net_device *dev, ...@@ -264,8 +264,10 @@ static u32 hwmp_route_info_get(struct net_device *dev,
rcu_read_lock(); rcu_read_lock();
sta = sta_info_get(local, mgmt->sa); sta = sta_info_get(local, mgmt->sa);
if (!sta) if (!sta) {
rcu_read_unlock();
return 0; return 0;
}
last_hop_metric = airtime_link_metric_get(local, sta); last_hop_metric = airtime_link_metric_get(local, sta);
/* Update and check originator routing info */ /* Update and check originator routing info */
...@@ -293,6 +295,7 @@ static u32 hwmp_route_info_get(struct net_device *dev, ...@@ -293,6 +295,7 @@ static u32 hwmp_route_info_get(struct net_device *dev,
break; break;
default: default:
sta_info_put(sta); sta_info_put(sta);
rcu_read_unlock();
return 0; return 0;
} }
new_metric = orig_metric + last_hop_metric; new_metric = orig_metric + last_hop_metric;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment