mac80211: remove useless double check for open_count in __ieee80211_suspend()
authorLuciano Coelho <luciano.coelho@intel.com>
Sun, 1 Mar 2015 07:10:07 +0000 (09:10 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 4 Mar 2015 09:34:09 +0000 (10:34 +0100)
We check local->open_count at the top of the __ieee80211_suspend(), so
there's no need to check for it again.  open_count is protected by the
rtnl, so there's no chance for it to have change between the two
calls.

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>
net/mac80211/pm.c

index bd185f38def147e002b38ff23359e70137d876a3..46ffe3ad7c466c693cdade2cd3a551eb1eb6278b 100644 (file)
@@ -59,7 +59,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
        cancel_work_sync(&local->dynamic_ps_enable_work);
        del_timer_sync(&local->dynamic_ps_timer);
 
-       local->wowlan = wowlan && local->open_count;
+       local->wowlan = wowlan;
        if (local->wowlan) {
                int err;