Skip to contentSkip to conversation

net/80211: simplify mesh code

PATCH In review Pavel Machek 2 participants 2 messages Jun 4, 2020 – Jun 16, 2020

Subsystems (3)
Networking Network drivers mac80211
lore
Share & tools
lore

Pavel Machek

author
#0 lore raw

PATCH 1/1 net/80211: simplify mesh code

Doing mod_timer() conditionaly is easier than conditionally unlocking and jumping around...

Signed-off-by Pavel Machek (CIP) <[email protected]>
net/mac80211/mesh_hwmp.c +2 -5
index aa5150929996..02cde0fd08fe 100644
@@ -1105,11 +1105,8 @@ void mesh_path_start_discovery(struct ieee80211_sub_if_data *sdata)
 			       ttl, lifetime, 0, ifmsh->preq_id++, sdata);
 
 	spin_lock_bh(&mpath->state_lock);
-	if (mpath->flags & MESH_PATH_DELETED) {
-		spin_unlock_bh(&mpath->state_lock);
-		goto enddiscovery;
-	}
-	mod_timer(&mpath->timer, jiffies + mpath->discovery_timeout);
+	if (!(mpath->flags & MESH_PATH_DELETED))
+		mod_timer(&mpath->timer, jiffies + mpath->discovery_timeout);
 	spin_unlock_bh(&mpath->state_lock);
 
 enddiscovery:
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html