summary refs log tree commit diff
path: root/net/mac80211/sta_info.c
diff options
context:
space:
mode:
authorBaligh Gasmi <gasmibal@gmail.com>2022-02-03 16:30:34 +0100
committerJohannes Berg <johannes.berg@intel.com>2022-02-04 16:27:07 +0100
commit45d33746d2f2dd45d9b471e4d1ccb27e337fd2e8 (patch)
treef36ac6ba26d98aa9a62e59652523b8399595b23f /net/mac80211/sta_info.c
parentea5907db2a9ccf37fdb6d1e67bcb620c1fea10f8 (diff)
downloadlinux-45d33746d2f2dd45d9b471e4d1ccb27e337fd2e8.tar.gz
mac80211: remove useless ieee80211_vif_is_mesh() check
We check ieee80211_vif_is_mesh() at the top if() block,
there's no need to check for it again.

Signed-off-by: Baligh Gasmi <gasmibal@gmail.com>
Link: https://lore.kernel.org/r/20220203153035.198697-1-gasmibal@gmail.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/sta_info.c')
-rw-r--r--net/mac80211/sta_info.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 537535a88990..91fbb1ee5c38 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -364,8 +364,7 @@ struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata,
 			goto free;
 		sta->mesh->plink_sta = sta;
 		spin_lock_init(&sta->mesh->plink_lock);
-		if (ieee80211_vif_is_mesh(&sdata->vif) &&
-		    !sdata->u.mesh.user_mpm)
+		if (!sdata->u.mesh.user_mpm)
 			timer_setup(&sta->mesh->plink_timer, mesh_plink_timer,
 				    0);
 		sta->mesh->nonpeer_pm = NL80211_MESH_POWER_ACTIVE;