diff options
| author | David S. Miller <davem@davemloft.net> | 2021-04-21 02:44:04 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-04-21 02:44:04 +0300 |
| commit | 08322284c1620f01f0ece9907b6125be877e247b (patch) | |
| tree | 5068b7a970e6d332a83aa5f11e39330d3ddd825b /net/wireless/scan.c | |
| parent | c9ad20573a91ecfce45404bd0e33913b476613c5 (diff) | |
| parent | 010bfbe768f7ecc876ffba92db30432de4997e2a (diff) | |
| download | linux-08322284c1620f01f0ece9907b6125be877e247b.tar.xz | |
Merge tag 'mac80211-next-for-net-next-2021-04-20' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
Another set of updates, all over the map:
* set sk_pacing_shift for 802.3->802.11 encap offload
* some monitor support for 802.11->802.3 decap offload
* HE (802.11ax) spec updates
* userspace API for TDLS HE support
* along with various other small features, cleanups and
fixups
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wireless/scan.c')
| -rw-r--r-- | net/wireless/scan.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/wireless/scan.c b/net/wireless/scan.c index 758eb7d2a706..4f06c1825029 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -589,7 +589,7 @@ static int cfg80211_parse_colocated_ap(const struct cfg80211_bss_ies *ies, elem = cfg80211_find_elem(WLAN_EID_REDUCED_NEIGHBOR_REPORT, ies->data, ies->len); - if (!elem || elem->datalen > IEEE80211_MAX_SSID_LEN) + if (!elem) return 0; pos = elem->data; @@ -1751,6 +1751,8 @@ cfg80211_bss_update(struct cfg80211_registered_device *rdev, if (rdev->bss_entries >= bss_entries_limit && !cfg80211_bss_expire_oldest(rdev)) { + if (!list_empty(&new->hidden_list)) + list_del(&new->hidden_list); kfree(new); goto drop; } |