Search Linux Wireless

[PATCH compat] Fix ksize() breakage on older kernels

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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

Signed-off-by: Michael Buesch <mb@xxxxxxxxx>

---

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.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Host AP]     [ATH6KL]     [Linux Bluetooth]     [Linux Netdev]     [Kernel Newbies]     [Linux Kernel]     [IDE]     [Security]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux ATA RAID]     [Samba]     [Device Mapper]
  Powered by Linux