summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/mac80211/parse.c1
-rw-r--r--versions2
2 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/parse.c b/net/mac80211/parse.c
index d931322d28..a3546fef98 100644
--- a/net/mac80211/parse.c
+++ b/net/mac80211/parse.c
@@ -812,6 +812,7 @@ static void ieee80211_mle_parse_link(struct ieee802_11_elems *elems,
elems->ml_basic = (const void *)elems->scratch_pos;
elems->ml_basic_len = ml_len;
+ elems->scratch_pos += ml_len;
ieee80211_mle_get_sta_prof(elems, params->link_id);
prof = elems->prof;
diff --git a/versions b/versions
index 20207223d4..1a7064cffc 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:11879:9c8adcfb"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11880:c0dc3d83"