]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
mac80211: remove unnecessary num_mcast_sta check
authorMichael Braun <michael-dev@fami-braun.de>
Mon, 10 Oct 2016 17:12:20 +0000 (19:12 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 12 Oct 2016 09:11:08 +0000 (11:11 +0200)
Checking for num_mcast_sta in __ieee80211_request_smps_ap() is
unnecessary as sta list will be empty in this case anyway, so
the list iteration will just exit immediately. Since this isn't
a "hot" code path, it doesn't really matter, and the next patch
will redefine num_mcast_sta to make this check invalid.

Signed-off-by: Michael Braun <michael-dev@fami-braun.de>
[change commit message]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/cfg.c

index 7d0172395589f5372f48d08a795fa4be976a765a..7de34a3fbd3519635a96fb50b96b727f55a45350 100644 (file)
@@ -2477,13 +2477,6 @@ int __ieee80211_request_smps_ap(struct ieee80211_sub_if_data *sdata,
            smps_mode == IEEE80211_SMPS_AUTOMATIC)
                return 0;
 
-        /* If no associated stations, there's no need to do anything */
-       if (!atomic_read(&sdata->u.ap.num_mcast_sta)) {
-               sdata->smps_mode = smps_mode;
-               ieee80211_queue_work(&sdata->local->hw, &sdata->recalc_smps);
-               return 0;
-       }
-
        ht_dbg(sdata,
               "SMPS %d requested in AP mode, sending Action frame to %d stations\n",
               smps_mode, atomic_read(&sdata->u.ap.num_mcast_sta));