diff options
| author | David S. Miller <davem@davemloft.net> | 2018-12-05 11:46:06 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-12-05 11:46:06 -0800 |
| commit | 64d47902fea3dcd3f2d0f3366259984dbc31653b (patch) | |
| tree | 2e45d1a2f499278ac27309fce9c2c12e51958d50 /net/wireless/util.c | |
| parent | 0fb628f0f250c74b1023edd0ca4a57c8b35b9b2c (diff) | |
| parent | 312ca38ddda64bac6513ec68e0ac3789b4eb44dc (diff) | |
Merge tag 'mac80211-for-davem-2018-12-05' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg:
====================
As it's been a while, we have various fixes for
* hwsim
* AP mode (client powersave related)
* CSA/FTM interaction
* a busy loop in IE handling
* and similar
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wireless/util.c')
| -rw-r--r-- | net/wireless/util.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/wireless/util.c b/net/wireless/util.c index ef14d80ca03e..d473bd135da8 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -1421,6 +1421,8 @@ size_t ieee80211_ie_split_ric(const u8 *ies, size_t ielen, ies[pos + ext], ext == 2)) pos = skip_ie(ies, ielen, pos); + else + break; } } else { pos = skip_ie(ies, ielen, pos); |