aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorLuciano Coelho <luciano.coelho@intel.com>2015-03-01 02:10:10 -0500
committerJohannes Berg <johannes.berg@intel.com>2015-03-04 04:34:10 -0500
commit0b4e11074a933937ee75be371d32bf91a0051419 (patch)
tree271de8ba69d48dac0d51229bf5c0b0bfbd3c3b4c /net/mac80211
parentae2e9fba85f69e0b53b1ef15e3011ce09ac1b9f2 (diff)
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: Luciano Coelho <luciano.coelho@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/mlme.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index c5f3bd6ac99e..bc2975e91272 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -1621,9 +1621,6 @@ void ieee80211_dynamic_ps_timer(unsigned long data)
1621{ 1621{
1622 struct ieee80211_local *local = (void *) data; 1622 struct ieee80211_local *local = (void *) data;
1623 1623
1624 if (local->quiescing || local->suspended)
1625 return;
1626
1627 ieee80211_queue_work(&local->hw, &local->dynamic_ps_enable_work); 1624 ieee80211_queue_work(&local->hw, &local->dynamic_ps_enable_work);
1628} 1625}
1629 1626
@@ -3899,12 +3896,8 @@ static void ieee80211_sta_bcn_mon_timer(unsigned long data)
3899{ 3896{
3900 struct ieee80211_sub_if_data *sdata = 3897 struct ieee80211_sub_if_data *sdata =
3901 (struct ieee80211_sub_if_data *) data; 3898 (struct ieee80211_sub_if_data *) data;
3902 struct ieee80211_local *local = sdata->local;
3903 struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; 3899 struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
3904 3900
3905 if (local->quiescing)
3906 return;
3907
3908 if (sdata->vif.csa_active && !ifmgd->csa_waiting_bcn) 3901 if (sdata->vif.csa_active && !ifmgd->csa_waiting_bcn)
3909 return; 3902 return;
3910 3903
@@ -3920,9 +3913,6 @@ static void ieee80211_sta_conn_mon_timer(unsigned long data)
3920 struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; 3913 struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
3921 struct ieee80211_local *local = sdata->local; 3914 struct ieee80211_local *local = sdata->local;
3922 3915
3923 if (local->quiescing)
3924 return;
3925
3926 if (sdata->vif.csa_active && !ifmgd->csa_waiting_bcn) 3916 if (sdata->vif.csa_active && !ifmgd->csa_waiting_bcn)
3927 return; 3917 return;
3928 3918