aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2018-06-29 09:51:39 +0200
committerJohannes Berg <johannes.berg@intel.com>2018-06-29 09:51:39 +0200
commitf0c0407d2a9fc3b2be33ec6c67ebc1f73595d2cb (patch)
tree00e7f8c20553391f46b1ad46ef93a4014a562724 /net/mac80211
parentmac80211: fix potential null pointer dereference (diff)
downloadlinux-dev-f0c0407d2a9fc3b2be33ec6c67ebc1f73595d2cb.tar.xz
linux-dev-f0c0407d2a9fc3b2be33ec6c67ebc1f73595d2cb.zip
mac80211: remove unnecessary NULL check
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>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/mlme.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index f4513031f1bc..7fb9957359a3 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -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;
}