diff --git a/[refs] b/[refs] index bd17cd697727..44c9f88ce63e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 90ccda9baccec8223ca5456fbe49adf7264d1543 +refs/heads/master: 273de92c8461776aaac7b32f8d5889a72b38ea10 diff --git a/trunk/net/wireless/scan.c b/trunk/net/wireless/scan.c index 723aeb3d9462..5dd909a4e601 100644 --- a/trunk/net/wireless/scan.c +++ b/trunk/net/wireless/scan.c @@ -384,11 +384,9 @@ cfg80211_bss_update(struct cfg80211_registered_device *dev, } else { u8 *ies = found->pub.information_elements; - if (found->ies_allocated) { - if (ksize(ies) < ielen) - ies = krealloc(ies, ielen, - GFP_ATOMIC); - } else + if (found->ies_allocated) + ies = krealloc(ies, ielen, GFP_ATOMIC); + else ies = kmalloc(ielen, GFP_ATOMIC); if (ies) {