Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad99d141 authored by Javier Cardona's avatar Javier Cardona Committed by John W. Linville
Browse files

mac80211: Remove redundant mesh path expiration checks 



Signed-off-by: default avatarJavier Cardona <javier@cozybit.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f5e50cd0

net/mac80211/mesh_pathtbl.c

+3 −6
Original line number Diff line number Diff line
@@ -359,7 +359,6 @@ struct mesh_path *mesh_path_lookup(u8 *dst, struct ieee80211_sub_if_data *sdata) 
				memcmp(dst, mpath->dst, ETH_ALEN) == 0) {

			if (MPATH_EXPIRED(mpath)) {

				spin_lock_bh(&mpath->state_lock);

				if (MPATH_EXPIRED(mpath))

				mpath->flags &= ~MESH_PATH_ACTIVE;

				spin_unlock_bh(&mpath->state_lock);

			}
@@ -386,7 +385,6 @@ struct mesh_path *mpp_path_lookup(u8 *dst, struct ieee80211_sub_if_data *sdata) 
		    memcmp(dst, mpath->dst, ETH_ALEN) == 0) {

			if (MPATH_EXPIRED(mpath)) {

				spin_lock_bh(&mpath->state_lock);

				if (MPATH_EXPIRED(mpath))

				mpath->flags &= ~MESH_PATH_ACTIVE;

				spin_unlock_bh(&mpath->state_lock);

			}
@@ -420,7 +418,6 @@ struct mesh_path *mesh_path_lookup_by_idx(int idx, struct ieee80211_sub_if_data 
		if (j++ == idx) {

			if (MPATH_EXPIRED(node->mpath)) {

				spin_lock_bh(&node->mpath->state_lock);

				if (MPATH_EXPIRED(node->mpath))

				node->mpath->flags &= ~MESH_PATH_ACTIVE;

				spin_unlock_bh(&node->mpath->state_lock);

			}