linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH compat] Fix ksize() breakage on older kernels
@ 2009-04-25 20:16 Michael Buesch
  0 siblings, 0 replies; only message in thread
From: Michael Buesch @ 2009-04-25 20:16 UTC (permalink / raw)
  To: Luis Rodriguez; +Cc: linux-wireless

The following patch should fix the ksize() compilation error
for older kernels without exported ksize().

Signed-off-by: Michael Buesch <mb@bu3sch.de>

---

Index: compat-wireless-2009-04-20/net/wireless/scan.c
===================================================================
--- compat-wireless-2009-04-20.orig/net/wireless/scan.c	2009-04-25 21:58:17.000000000 +0200
+++ compat-wireless-2009-04-20/net/wireless/scan.c	2009-04-25 22:00:01.000000000 +0200
@@ -377,7 +377,11 @@
 			size_t used = dev->wiphy.bss_priv_size + sizeof(*res);
 			size_t ielen = res->pub.len_information_elements;
 
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,28)
+			if (0) {
+#else
 			if (ksize(found) >= used + ielen) {
+#endif
 				memcpy(found->pub.information_elements,
 				       res->pub.information_elements, ielen);
 				found->pub.len_information_elements = ielen;
@@ -385,9 +389,8 @@
 				u8 *ies = found->pub.information_elements;
 
 				if (found->ies_allocated) {
-					if (ksize(ies) < ielen)
-						ies = krealloc(ies, ielen,
-							       GFP_ATOMIC);
+					ies = krealloc(ies, ielen,
+						       GFP_ATOMIC);
 				} else
 					ies = kmalloc(ielen, GFP_ATOMIC);
 


-- 
Greetings, Michael.

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2009-04-25 20:19 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-04-25 20:16 [PATCH compat] Fix ksize() breakage on older kernels Michael Buesch

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).