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

Commit 0b4e1107 authored by Luciano Coelho's avatar Luciano Coelho Committed by Johannes Berg
Browse files

mac80211: remove duplicate check for quiescing when queueing work 



In ieee80211_queue_work() we check if we're quiescing or suspended, so
it's not necessary to check for quiescing before calling this
function.  Remove duplicate checks.

Signed-off-by: default avatarLuciano Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent ae2e9fba

net/mac80211/mlme.c

+0 −10
Original line number Original line Diff line number Diff line
@@ -1621,9 +1621,6 @@ void ieee80211_dynamic_ps_timer(unsigned long data) 
{

{

	struct ieee80211_local *local = (void *) data;

	struct ieee80211_local *local = (void *) data;





	if (local->quiescing || local->suspended)

		return;



	ieee80211_queue_work(&local->hw, &local->dynamic_ps_enable_work);

	ieee80211_queue_work(&local->hw, &local->dynamic_ps_enable_work);

}

}
@@ -3899,12 +3896,8 @@ static void ieee80211_sta_bcn_mon_timer(unsigned long data) 
{

{

	struct ieee80211_sub_if_data *sdata =

	struct ieee80211_sub_if_data *sdata =

		(struct ieee80211_sub_if_data *) data;

		(struct ieee80211_sub_if_data *) data;

	struct ieee80211_local *local = sdata->local;

	struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;

	struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;





	if (local->quiescing)

		return;



	if (sdata->vif.csa_active && !ifmgd->csa_waiting_bcn)

	if (sdata->vif.csa_active && !ifmgd->csa_waiting_bcn)

		return;

		return;
@@ -3920,9 +3913,6 @@ static void ieee80211_sta_conn_mon_timer(unsigned long data) 
	struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;

	struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;

	struct ieee80211_local *local = sdata->local;

	struct ieee80211_local *local = sdata->local;





	if (local->quiescing)

		return;



	if (sdata->vif.csa_active && !ifmgd->csa_waiting_bcn)

	if (sdata->vif.csa_active && !ifmgd->csa_waiting_bcn)

		return;

		return;