From d1f5d3ab7f899ea5694858fef21885538eae0a60 Mon Sep 17 00:00:00 2001
From: Michael Buesch <mb@bu3sch.de>
Date: Sat, 25 Apr 2009 22:28:55 +0200
Subject: [PATCH] --- yaml --- r: 150145 b: refs/heads/master c:
 273de92c8461776aaac7b32f8d5889a72b38ea10 h: refs/heads/master i:   150143:
 c1dea862b0e501d7b64ac435b7096b827206e268 v: v3

---
 [refs]                    | 2 +-
 trunk/net/wireless/scan.c | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

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) {