From: Baligh Gasmi Date: Thu, 3 Feb 2022 15:30:34 +0000 (+0100) Subject: mac80211: remove useless ieee80211_vif_is_mesh() check X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=45d33746d2f2dd45d9b471e4d1ccb27e337fd2e8;p=linux.git 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 Link: https://lore.kernel.org/r/20220203153035.198697-1-gasmibal@gmail.com Signed-off-by: Johannes Berg --- diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 537535a88990c..91fbb1ee5c388 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;