summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2024-02-09 15:55:14 +0100
committeriwlwifi publisher <>2024-04-17 12:49:25 +0000
commit25f94fe4c1491c97a726a203e200e6c2c5a8959d (patch)
tree850ddd3e8bc337be71530ccb1d69b881cc9d75ff
parent48d1b99a800a3d20ccf4efa03959fea9c2c549f0 (diff)
downloadbackport-iwlwifi-25f94fe4c1491c97a726a203e200e6c2c5a8959d.tar.gz
wifi: mac80211: remove unneeded scratch_len subtraction
We're always using "scratch + len - pos", so we don't need to subtract here to calculate the remaining length. Remove the unnecessary subtraction. type=cleanup ticket=none fixes=I6fa45d7ceddd790b90e83ecbf1e14e955a52a5f6 Change-Id: I7a9758fb9bc6b726aac49804f2f05cd521bc4128 Signed-off-by: Johannes Berg <johannes.berg@intel.com> Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/93720 tested: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> automatic-review: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> Reviewed-by: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com> Reviewed-by: Ilan Peer <ilan.peer@intel.com> x-iwlwifi-stack-dev: ea34ec3c2a8cf1942c7ad3331117c030b5de12d2
-rw-r--r--net/mac80211/parse.c1
-rw-r--r--versions2
2 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/parse.c b/net/mac80211/parse.c
index 86f7117607..c0a10dd522 100644
--- a/net/mac80211/parse.c
+++ b/net/mac80211/parse.c
@@ -881,7 +881,6 @@ ieee802_11_parse_elems_full(struct ieee80211_elems_parse_params *params)
elems, params->bss,
nontransmitted_profile);
elems->scratch_pos += nontransmitted_profile_len;
- elems->scratch_len -= nontransmitted_profile_len;
non_inherit = cfg80211_find_ext_elem(WLAN_EID_EXT_NON_INHERITANCE,
nontransmitted_profile,
nontransmitted_profile_len);
diff --git a/versions b/versions
index 5965db793a..4b4cd90df0 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:11898:b2b1b212"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11899:ea34ec3c"