summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2024-02-09 11:17:56 +0100
committeriwlwifi publisher <>2024-04-17 12:48:55 +0000
commitd253a4cb9589d91e1a23aae58bf89c48b4ea2b57 (patch)
treee0be6a10f6f7075a6a996765b5a5fde13c727ab1
parent86b5144ac0c28224c9d7dfef91da8bd732825279 (diff)
downloadbackport-iwlwifi-d253a4cb9589d91e1a23aae58bf89c48b4ea2b57.tar.gz
wifi: mac80211: remove unnecessary ML element checks
Given the prior changes to ieee80211_mle_size_ok(), we can now pass NULL to for_each_mle_subelement(), so no longer need to check for that here explicitly. type=cleanup ticket=none Change-Id: Ia2ee0aafdc8a48bd21b485cc36a9866f950d781b Signed-off-by: Johannes Berg <johannes.berg@intel.com> Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/93700 automatic-review: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> tested: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> Reviewed-by: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com> x-iwlwifi-stack-dev: e85e5c6d89e592a90bcdf7e562819af1c72796ad
-rw-r--r--net/mac80211/parse.c3
-rw-r--r--versions2
2 files changed, 1 insertions, 4 deletions
diff --git a/net/mac80211/parse.c b/net/mac80211/parse.c
index 3b50ec8438..97153250c6 100644
--- a/net/mac80211/parse.c
+++ b/net/mac80211/parse.c
@@ -739,9 +739,6 @@ static void ieee80211_mle_get_sta_prof(struct ieee802_11_elems *elems,
ssize_t ml_len = elems->ml_basic_len;
const struct element *sub;
- if (!ml || !ml_len)
- return;
-
for_each_mle_subelement(sub, (u8 *)ml, ml_len) {
struct ieee80211_mle_per_sta_profile *prof = (void *)sub->data;
ssize_t sta_prof_len;
diff --git a/versions b/versions
index 723f5deddc..c3cac49207 100644
--- a/versions
+++ b/versions
@@ -2,4 +2,4 @@ BACKPORTS_VERSION="(see git)"
BACKPORTED_KERNEL_VERSION="(see git)"
BACKPORTED_KERNEL_NAME="iwlwifi"
BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__
-BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11895:c18739fe"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11896:e85e5c6d"