]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
mac80211: remove unnecessary NULL check
authorJohannes Berg <johannes.berg@intel.com>
Fri, 29 Jun 2018 07:51:39 +0000 (09:51 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Fri, 29 Jun 2018 07:51:39 +0000 (09:51 +0200)
We don't need to check if he_oper is NULL before calling
ieee80211_verify_sta_he_mcs_support() as it - now - will
correctly check this itself. Remove the redundant check.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/mlme.c

index f4513031f1bc8e43fba5a53894dd7082dac0ad6f..7fb9957359a3c1be557e577ba5b76cc4c1177105 100644 (file)
@@ -4592,8 +4592,7 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata,
                else
                        he_oper = NULL;
 
-               if (!he_oper ||
-                   !ieee80211_verify_sta_he_mcs_support(sband, he_oper))
+               if (!ieee80211_verify_sta_he_mcs_support(sband, he_oper))
                        ifmgd->flags |= IEEE80211_STA_DISABLE_HE;
        }