diff --git a/[refs] b/[refs] index 44c9f88ce63e..d8415375a0d7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 273de92c8461776aaac7b32f8d5889a72b38ea10 +refs/heads/master: 44e1b98f733e48bb781e4229120e1de5e0c9fdbb diff --git a/trunk/net/wireless/scan.c b/trunk/net/wireless/scan.c index 5dd909a4e601..10b4887dfa6b 100644 --- a/trunk/net/wireless/scan.c +++ b/trunk/net/wireless/scan.c @@ -377,7 +377,7 @@ cfg80211_bss_update(struct cfg80211_registered_device *dev, size_t used = dev->wiphy.bss_priv_size + sizeof(*res); size_t ielen = res->pub.len_information_elements; - if (ksize(found) >= used + ielen) { + if (!found->ies_allocated && ksize(found) >= used + ielen) { memcpy(found->pub.information_elements, res->pub.information_elements, ielen); found->pub.len_information_elements = ielen;