OSDN Git Service

mac80211: remove useless ieee80211_vif_is_mesh() check
authorBaligh Gasmi <gasmibal@gmail.com>
Thu, 3 Feb 2022 15:30:34 +0000 (16:30 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Fri, 4 Feb 2022 15:27:07 +0000 (16:27 +0100)
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>
net/mac80211/sta_info.c

index 537535a..91fbb1e 100644 (file)
@@ -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;