aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-20 19:41:09 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-20 19:41:09 -0400
commit786eeeb3756e7fb08174c3a136c16462ccd541d1 (patch)
tree9b7621b4448768f8f950e80a1bba468652608f1c /drivers/staging
parent55a27055b9ea5aabf8206ed6b7777c79f4e840c3 (diff)
staging: csr: remove CsrPmemAlloc
It's just a wrapper around kmalloc(, GFP_KERNEL) + a call to panic() if we are out of memory, which is a very foolish thing to do (the panic that is.) So replace it with calls to kmalloc() and ignore the out-of-memory casese for now, odds are it will not be hit, and if it does, hey, we will end up panicing just the same as with the old code. Cc: Mikko Virkkilä <mikko.virkkila@bluegiga.com> Cc: Lauri Hintsala <Lauri.Hintsala@bluegiga.com> Cc: Riku Mettälä <riku.mettala@bluegiga.com> Cc: Veli-Pekka Peltola <veli-pekka.peltola@bluegiga.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/csr/Makefile1
-rw-r--r--drivers/staging/csr/csr_msgconv.c4
-rw-r--r--drivers/staging/csr/csr_pmem.c40
-rw-r--r--drivers/staging/csr/csr_pmem.h31
-rw-r--r--drivers/staging/csr/csr_sched.h4
-rw-r--r--drivers/staging/csr/csr_serialize_primitive_types.c23
-rw-r--r--drivers/staging/csr/csr_utf16.c14
-rw-r--r--drivers/staging/csr/csr_wifi_fsm.h2
-rw-r--r--drivers/staging/csr/csr_wifi_hip_card_sdio.c2
-rw-r--r--drivers/staging/csr/csr_wifi_nme_ap_lib.h26
-rw-r--r--drivers/staging/csr/csr_wifi_nme_ap_serialize.c26
-rw-r--r--drivers/staging/csr/csr_wifi_nme_lib.h56
-rw-r--r--drivers/staging/csr/csr_wifi_router_ctrl_lib.h124
-rw-r--r--drivers/staging/csr/csr_wifi_router_ctrl_serialize.c136
-rw-r--r--drivers/staging/csr/csr_wifi_router_lib.h18
-rw-r--r--drivers/staging/csr/csr_wifi_router_serialize.c20
-rw-r--r--drivers/staging/csr/csr_wifi_router_transport.c2
-rw-r--r--drivers/staging/csr/csr_wifi_serialize_primitive_types.c11
-rw-r--r--drivers/staging/csr/csr_wifi_sme_ap_lib.h42
-rw-r--r--drivers/staging/csr/csr_wifi_sme_lib.h256
-rw-r--r--drivers/staging/csr/csr_wifi_sme_serialize.c282
-rw-r--r--drivers/staging/csr/drv.c2
-rw-r--r--drivers/staging/csr/putest.c2
-rw-r--r--drivers/staging/csr/sme_mgt.c2
-rw-r--r--drivers/staging/csr/ul_int.c5
-rw-r--r--drivers/staging/csr/unifi_sme.c8
26 files changed, 534 insertions, 605 deletions
diff --git a/drivers/staging/csr/Makefile b/drivers/staging/csr/Makefile
index f4a8950bfaee..814f57a539db 100644
--- a/drivers/staging/csr/Makefile
+++ b/drivers/staging/csr/Makefile
@@ -69,7 +69,6 @@ csr_wifi-y := bh.o \
69csr_helper-y := csr_time.o \ 69csr_helper-y := csr_time.o \
70 csr_util.o \ 70 csr_util.o \
71 csr_framework_ext.o \ 71 csr_framework_ext.o \
72 csr_pmem.o \
73 csr_wifi_serialize_primitive_types.o \ 72 csr_wifi_serialize_primitive_types.o \
74 csr_serialize_primitive_types.o \ 73 csr_serialize_primitive_types.o \
75 csr_utf16.o \ 74 csr_utf16.o \
diff --git a/drivers/staging/csr/csr_msgconv.c b/drivers/staging/csr/csr_msgconv.c
index 42e0a4aef0a7..dbf0d64a206a 100644
--- a/drivers/staging/csr/csr_msgconv.c
+++ b/drivers/staging/csr/csr_msgconv.c
@@ -233,7 +233,7 @@ void CsrMsgConvInsert(u16 primType, const CsrMsgConvMsgEntry *ce)
233 } 233 }
234 else 234 else
235 { 235 {
236 pc = CsrPmemAlloc(sizeof(*pc)); 236 pc = kmalloc(sizeof(*pc), GFP_KERNEL);
237 pc->primType = primType; 237 pc->primType = primType;
238 pc->conv = ce; 238 pc->conv = ce;
239 pc->lookupFunc = NULL; 239 pc->lookupFunc = NULL;
@@ -279,7 +279,7 @@ CsrMsgConvEntry *CsrMsgConvInit(void)
279{ 279{
280 if (!converter) 280 if (!converter)
281 { 281 {
282 converter = (CsrMsgConvEntry *) CsrPmemAlloc(sizeof(CsrMsgConvEntry)); 282 converter = kmalloc(sizeof(CsrMsgConvEntry), GFP_KERNEL);
283 283
284 converter->profile_converters = NULL; 284 converter->profile_converters = NULL;
285 converter->free_message = free_message; 285 converter->free_message = free_message;
diff --git a/drivers/staging/csr/csr_pmem.c b/drivers/staging/csr/csr_pmem.c
deleted file mode 100644
index a2779256005c..000000000000
--- a/drivers/staging/csr/csr_pmem.c
+++ /dev/null
@@ -1,40 +0,0 @@
1/*****************************************************************************
2
3 (c) Cambridge Silicon Radio Limited 2010
4 All rights reserved and confidential information of CSR
5
6 Refer to LICENSE.txt included with this source for details
7 on the license terms.
8
9*****************************************************************************/
10
11#include <linux/kernel.h>
12#include <linux/version.h>
13#include <linux/module.h>
14
15
16#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)
17#include <linux/autoconf.h>
18#elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 16)
19#include <linux/config.h>
20#endif
21
22#include <linux/slab.h>
23
24#include "csr_panic.h"
25#include "csr_pmem.h"
26
27void *CsrPmemAlloc(size_t size)
28{
29 void *ret;
30
31 ret = kmalloc(size, GFP_KERNEL);
32 if (!ret)
33 {
34 CsrPanic(CSR_TECH_FW, CSR_PANIC_FW_HEAP_EXHAUSTION,
35 "out of memory");
36 }
37
38 return ret;
39}
40EXPORT_SYMBOL_GPL(CsrPmemAlloc);
diff --git a/drivers/staging/csr/csr_pmem.h b/drivers/staging/csr/csr_pmem.h
index 283aff09d867..1fb74fa0d1c7 100644
--- a/drivers/staging/csr/csr_pmem.h
+++ b/drivers/staging/csr/csr_pmem.h
@@ -17,36 +17,6 @@
17extern "C" { 17extern "C" {
18#endif 18#endif
19 19
20#ifndef CSR_PMEM_DEBUG_ENABLE
21/*****************************************************************************
22
23 NAME
24 CsrPmemAlloc
25
26 DESCRIPTION
27 This function will allocate a contiguous block of memory of at least
28 the specified size in bytes and return a pointer to the allocated
29 memory. This function is not allowed to return NULL. A size of 0 is a
30 valid request, and a unique and valid (not NULL) pointer must be
31 returned in this case.
32
33 PARAMETERS
34 size - Size of memory requested. Note that a size of 0 is valid.
35
36 RETURNS
37 Pointer to allocated memory.
38
39*****************************************************************************/
40#ifdef CSR_PMEM_DEBUG
41void *CsrPmemAllocDebug(size_t size,
42 const char *file, u32 line);
43#define CsrPmemAlloc(sz) CsrPmemAllocDebug((sz), __FILE__, __LINE__)
44#else
45void *CsrPmemAlloc(size_t size);
46#endif
47
48#endif
49
50/***************************************************************************** 20/*****************************************************************************
51 21
52 NAME 22 NAME
@@ -114,7 +84,6 @@ typedef void (CsrPmemDebugOnFree)(void *ptr, void *userptr, CsrPmemDebugAllocTyp
114void CsrPmemDebugInstallHooks(u8 headSize, u8 endSize, CsrPmemDebugOnAlloc *onAllocCallback, CsrPmemDebugOnFree *onFreeCallback); 84void CsrPmemDebugInstallHooks(u8 headSize, u8 endSize, CsrPmemDebugOnAlloc *onAllocCallback, CsrPmemDebugOnFree *onFreeCallback);
115 85
116void *CsrPmemDebugAlloc(size_t size, CsrPmemDebugAllocType type, const char* file, u32 line); 86void *CsrPmemDebugAlloc(size_t size, CsrPmemDebugAllocType type, const char* file, u32 line);
117#define CsrPmemAlloc(size) CsrPmemDebugAlloc(size, CSR_PMEM_DEBUG_TYPE_PMEM_ALLOC, __FILE__, __LINE__)
118 87
119void CsrPmemDebugFree(void *ptr, CsrPmemDebugAllocType type, const char* file, u32 line); 88void CsrPmemDebugFree(void *ptr, CsrPmemDebugAllocType type, const char* file, u32 line);
120 89
diff --git a/drivers/staging/csr/csr_sched.h b/drivers/staging/csr/csr_sched.h
index 7ae1ea5b3229..cc1b8bf66079 100644
--- a/drivers/staging/csr/csr_sched.h
+++ b/drivers/staging/csr/csr_sched.h
@@ -120,9 +120,9 @@ void CsrSchedBgintSet(CsrSchedBgint bgint);
120 * be null. 120 * be null.
121 * 121 *
122 * NOTE 122 * NOTE
123 * If "mv" is not null then it will typically be a chunk of CsrPmemAlloc()ed 123 * If "mv" is not null then it will typically be a chunk of kmalloc()ed
124 * memory, though there is no need for it to be so. Tasks should normally 124 * memory, though there is no need for it to be so. Tasks should normally
125 * obey the convention that when a message built with CsrPmemAlloc()ed memory 125 * obey the convention that when a message built with kmalloc()ed memory
126 * is given to CsrSchedMessagePut() then ownership of the memory is ceded to the 126 * is given to CsrSchedMessagePut() then ownership of the memory is ceded to the
127 * scheduler - and eventually to the recipient task. I.e., the receiver of 127 * scheduler - and eventually to the recipient task. I.e., the receiver of
128 * the message will be expected to kfree() the message storage. 128 * the message will be expected to kfree() the message storage.
diff --git a/drivers/staging/csr/csr_serialize_primitive_types.c b/drivers/staging/csr/csr_serialize_primitive_types.c
index a4b56323a048..bb08f1952bf0 100644
--- a/drivers/staging/csr/csr_serialize_primitive_types.c
+++ b/drivers/staging/csr/csr_serialize_primitive_types.c
@@ -9,6 +9,7 @@
9*****************************************************************************/ 9*****************************************************************************/
10 10
11#include <linux/module.h> 11#include <linux/module.h>
12#include <linux/slab.h>
12#include "csr_prim_defs.h" 13#include "csr_prim_defs.h"
13#include "csr_msgconv.h" 14#include "csr_msgconv.h"
14#include "csr_macro.h" 15#include "csr_macro.h"
@@ -66,7 +67,7 @@ void CsrUtf16StringDes(u16 **value, u8 *buffer, size_t *offset)
66 67
67 CsrUint32Des(&length, buffer, offset); 68 CsrUint32Des(&length, buffer, offset);
68 69
69 *value = CsrPmemAlloc(length * sizeof(**value)); 70 *value = kmalloc(length * sizeof(**value), GFP_KERNEL);
70 for (i = 0; i < length; i++) 71 for (i = 0; i < length; i++)
71 { 72 {
72 CsrUint16Des(&(*value)[i], buffer, offset); 73 CsrUint16Des(&(*value)[i], buffer, offset);
@@ -224,7 +225,7 @@ u8 *CsrEventSer(u8 *ptr, size_t *len, void *msg)
224 225
225void *CsrEventDes(u8 *buffer, size_t length) 226void *CsrEventDes(u8 *buffer, size_t length)
226{ 227{
227 CsrEvent *primitive = (CsrEvent *) CsrPmemAlloc(sizeof(CsrEvent)); 228 CsrEvent *primitive = kmalloc(sizeof(CsrEvent), GFP_KERNEL);
228 size_t offset = 0; 229 size_t offset = 0;
229 CsrUint16Des(&primitive->type, buffer, &offset); 230 CsrUint16Des(&primitive->type, buffer, &offset);
230 231
@@ -247,7 +248,7 @@ u8 *CsrEventCsrUint8Ser(u8 *ptr, size_t *len, void *msg)
247 248
248void *CsrEventCsrUint8Des(u8 *buffer, size_t length) 249void *CsrEventCsrUint8Des(u8 *buffer, size_t length)
249{ 250{
250 CsrEventCsrUint8 *primitive = (CsrEventCsrUint8 *) CsrPmemAlloc(sizeof(CsrEventCsrUint8)); 251 CsrEventCsrUint8 *primitive = kmalloc(sizeof(CsrEventCsrUint8), GFP_KERNEL);
251 252
252 size_t offset = 0; 253 size_t offset = 0;
253 CsrUint16Des(&primitive->type, buffer, &offset); 254 CsrUint16Des(&primitive->type, buffer, &offset);
@@ -272,7 +273,7 @@ u8 *CsrEventCsrUint16Ser(u8 *ptr, size_t *len, void *msg)
272 273
273void *CsrEventCsrUint16Des(u8 *buffer, size_t length) 274void *CsrEventCsrUint16Des(u8 *buffer, size_t length)
274{ 275{
275 CsrEventCsrUint16 *primitive = (CsrEventCsrUint16 *) CsrPmemAlloc(sizeof(CsrEventCsrUint16)); 276 CsrEventCsrUint16 *primitive = kmalloc(sizeof(CsrEventCsrUint16), GFP_KERNEL);
276 277
277 size_t offset = 0; 278 size_t offset = 0;
278 CsrUint16Des(&primitive->type, buffer, &offset); 279 CsrUint16Des(&primitive->type, buffer, &offset);
@@ -297,7 +298,7 @@ u8 *CsrEventCsrUint32Ser(u8 *ptr, size_t *len, void *msg)
297 298
298void *CsrEventCsrUint32Des(u8 *buffer, size_t length) 299void *CsrEventCsrUint32Des(u8 *buffer, size_t length)
299{ 300{
300 CsrEventCsrUint32 *primitive = (CsrEventCsrUint32 *) CsrPmemAlloc(sizeof(CsrEventCsrUint32)); 301 CsrEventCsrUint32 *primitive = kmalloc(sizeof(CsrEventCsrUint32), GFP_KERNEL);
301 302
302 size_t offset = 0; 303 size_t offset = 0;
303 CsrUint16Des(&primitive->type, buffer, &offset); 304 CsrUint16Des(&primitive->type, buffer, &offset);
@@ -323,7 +324,7 @@ u8 *CsrEventCsrUint16CsrUint8Ser(u8 *ptr, size_t *len, void *msg)
323 324
324void *CsrEventCsrUint16CsrUint8Des(u8 *buffer, size_t length) 325void *CsrEventCsrUint16CsrUint8Des(u8 *buffer, size_t length)
325{ 326{
326 CsrEventCsrUint16CsrUint8 *primitive = (CsrEventCsrUint16CsrUint8 *) CsrPmemAlloc(sizeof(CsrEventCsrUint16CsrUint8)); 327 CsrEventCsrUint16CsrUint8 *primitive = kmalloc(sizeof(CsrEventCsrUint16CsrUint8), GFP_KERNEL);
327 328
328 size_t offset = 0; 329 size_t offset = 0;
329 CsrUint16Des(&primitive->type, buffer, &offset); 330 CsrUint16Des(&primitive->type, buffer, &offset);
@@ -350,7 +351,7 @@ u8 *CsrEventCsrUint16CsrUint16Ser(u8 *ptr, size_t *len, void *msg)
350 351
351void *CsrEventCsrUint16CsrUint16Des(u8 *buffer, size_t length) 352void *CsrEventCsrUint16CsrUint16Des(u8 *buffer, size_t length)
352{ 353{
353 CsrEventCsrUint16CsrUint16 *primitive = (CsrEventCsrUint16CsrUint16 *) CsrPmemAlloc(sizeof(CsrEventCsrUint16CsrUint16)); 354 CsrEventCsrUint16CsrUint16 *primitive = kmalloc(sizeof(CsrEventCsrUint16CsrUint16), GFP_KERNEL);
354 355
355 size_t offset = 0; 356 size_t offset = 0;
356 CsrUint16Des(&primitive->type, buffer, &offset); 357 CsrUint16Des(&primitive->type, buffer, &offset);
@@ -377,7 +378,7 @@ u8 *CsrEventCsrUint16CsrUint32Ser(u8 *ptr, size_t *len, void *msg)
377 378
378void *CsrEventCsrUint16CsrUint32Des(u8 *buffer, size_t length) 379void *CsrEventCsrUint16CsrUint32Des(u8 *buffer, size_t length)
379{ 380{
380 CsrEventCsrUint16CsrUint32 *primitive = (CsrEventCsrUint16CsrUint32 *) CsrPmemAlloc(sizeof(CsrEventCsrUint16CsrUint32)); 381 CsrEventCsrUint16CsrUint32 *primitive = kmalloc(sizeof(CsrEventCsrUint16CsrUint32), GFP_KERNEL);
381 382
382 size_t offset = 0; 383 size_t offset = 0;
383 CsrUint16Des(&primitive->type, buffer, &offset); 384 CsrUint16Des(&primitive->type, buffer, &offset);
@@ -405,7 +406,7 @@ u8 *CsrEventCsrUint16CsrCharStringSer(u8 *ptr, size_t *len, void *msg)
405 406
406void *CsrEventCsrUint16CsrCharStringDes(u8 *buffer, size_t length) 407void *CsrEventCsrUint16CsrCharStringDes(u8 *buffer, size_t length)
407{ 408{
408 CsrEventCsrUint16CsrCharString *primitive = (CsrEventCsrUint16CsrCharString *) CsrPmemAlloc(sizeof(CsrEventCsrUint16CsrCharString)); 409 CsrEventCsrUint16CsrCharString *primitive = kmalloc(sizeof(CsrEventCsrUint16CsrCharString), GFP_KERNEL);
409 410
410 size_t offset = 0; 411 size_t offset = 0;
411 CsrUint16Des(&primitive->type, buffer, &offset); 412 CsrUint16Des(&primitive->type, buffer, &offset);
@@ -432,7 +433,7 @@ u8 *CsrEventCsrUint32CsrUint16Ser(u8 *ptr, size_t *len, void *msg)
432 433
433void *CsrEventCsrUint32CsrUint16Des(u8 *buffer, size_t length) 434void *CsrEventCsrUint32CsrUint16Des(u8 *buffer, size_t length)
434{ 435{
435 CsrEventCsrUint32CsrUint16 *primitive = (CsrEventCsrUint32CsrUint16 *) CsrPmemAlloc(sizeof(CsrEventCsrUint32CsrUint16)); 436 CsrEventCsrUint32CsrUint16 *primitive = kmalloc(sizeof(CsrEventCsrUint32CsrUint16), GFP_KERNEL);
436 437
437 size_t offset = 0; 438 size_t offset = 0;
438 CsrUint16Des(&primitive->type, buffer, &offset); 439 CsrUint16Des(&primitive->type, buffer, &offset);
@@ -460,7 +461,7 @@ u8 *CsrEventCsrUint32CsrCharStringSer(u8 *ptr, size_t *len, void *msg)
460 461
461void *CsrEventCsrUint32CsrCharStringDes(u8 *buffer, size_t length) 462void *CsrEventCsrUint32CsrCharStringDes(u8 *buffer, size_t length)
462{ 463{
463 CsrEventCsrUint32CsrCharString *primitive = (CsrEventCsrUint32CsrCharString *) CsrPmemAlloc(sizeof(CsrEventCsrUint32CsrCharString)); 464 CsrEventCsrUint32CsrCharString *primitive = kmalloc(sizeof(CsrEventCsrUint32CsrCharString), GFP_KERNEL);
464 465
465 size_t offset = 0; 466 size_t offset = 0;
466 CsrUint16Des(&primitive->type, buffer, &offset); 467 CsrUint16Des(&primitive->type, buffer, &offset);
diff --git a/drivers/staging/csr/csr_utf16.c b/drivers/staging/csr/csr_utf16.c
index f827342b1487..801d8a8c095f 100644
--- a/drivers/staging/csr/csr_utf16.c
+++ b/drivers/staging/csr/csr_utf16.c
@@ -88,7 +88,7 @@ u16 *CsrUint32ToUtf16String(u32 number)
88 noOfDigits++; 88 noOfDigits++;
89 } 89 }
90 90
91 output = (u16 *) CsrPmemAlloc(sizeof(u16) * (noOfDigits + 1)); /*add space for 0-termination*/ 91 output = kmalloc(sizeof(u16) * (noOfDigits + 1), GFP_KERNEL); /*add space for 0-termination*/
92 92
93 tempNumber = number; 93 tempNumber = number;
94 for (count = noOfDigits; count > 0; count--) 94 for (count = noOfDigits; count > 0; count--)
@@ -185,7 +185,7 @@ u16 *CsrUtf16ConcatenateTexts(const u16 *inputText1, const u16 *inputText2,
185 return NULL; 185 return NULL;
186 } 186 }
187 187
188 outputText = (u16 *) CsrPmemAlloc((textLen + 1) * sizeof(u16)); /* add space for 0-termination*/ 188 outputText = kmalloc((textLen + 1) * sizeof(u16), GFP_KERNEL); /* add space for 0-termination*/
189 189
190 190
191 if (inputText1 != NULL) 191 if (inputText1 != NULL)
@@ -320,7 +320,7 @@ u8 *CsrUtf16String2Utf8(const u16 *source)
320 } 320 }
321 } 321 }
322 322
323 dest = CsrPmemAlloc(length); 323 dest = kmalloc(length, GFP_KERNEL);
324 destStart = dest; 324 destStart = dest;
325 325
326 for (i = 0; i < sourceLength; i++) 326 for (i = 0; i < sourceLength; i++)
@@ -610,7 +610,7 @@ u16 *CsrUtf82Utf16String(const u8 *utf8String)
610 } 610 }
611 611
612 /* Create space for the null terminated character */ 612 /* Create space for the null terminated character */
613 dest = (u16 *) CsrPmemAlloc((1 + length) * sizeof(u16)); 613 dest = kmalloc((1 + length) * sizeof(u16), GFP_KERNEL);
614 destStart = dest; 614 destStart = dest;
615 615
616 for (i = 0; i < sourceLength; i++) 616 for (i = 0; i < sourceLength; i++)
@@ -736,7 +736,7 @@ u16 *CsrUtf16StringDuplicate(const u16 *source)
736 if (source) /* if source is not NULL*/ 736 if (source) /* if source is not NULL*/
737 { 737 {
738 length = (CsrUtf16StrLen(source) + 1) * sizeof(u16); 738 length = (CsrUtf16StrLen(source) + 1) * sizeof(u16);
739 target = (u16 *) CsrPmemAlloc(length); 739 target = kmalloc(length, GFP_KERNEL);
740 memcpy(target, source, length); 740 memcpy(target, source, length);
741 } 741 }
742 return target; 742 return target;
@@ -844,7 +844,7 @@ u16 *CsrUtf16String2XML(u16 *str)
844 844
845 if (encodeChars) 845 if (encodeChars)
846 { 846 {
847 resultString = outputString = CsrPmemAlloc(stringLength * sizeof(u16)); 847 resultString = outputString = kmalloc(stringLength * sizeof(u16), GFP_KERNEL);
848 848
849 scanString = str; 849 scanString = str;
850 850
@@ -958,7 +958,7 @@ u16 *CsrXML2Utf16String(u16 *str)
958 958
959 if (encodeChars) 959 if (encodeChars)
960 { 960 {
961 resultString = outputString = CsrPmemAlloc(stringLength * sizeof(u16)); 961 resultString = outputString = kmalloc(stringLength * sizeof(u16), GFP_KERNEL);
962 962
963 scanString = str; 963 scanString = str;
964 964
diff --git a/drivers/staging/csr/csr_wifi_fsm.h b/drivers/staging/csr/csr_wifi_fsm.h
index 83a9c9e2297a..e933ab1be43f 100644
--- a/drivers/staging/csr/csr_wifi_fsm.h
+++ b/drivers/staging/csr/csr_wifi_fsm.h
@@ -160,7 +160,7 @@ extern void CsrWifiFsmSendEventExternal(CsrWifiFsmContext *context, CsrWifiFsmEv
160 */ 160 */
161#define CsrWifiFsmSendAlienEventExternal(_context, _alienEvent, _source, _destination, _primtype, _id) \ 161#define CsrWifiFsmSendAlienEventExternal(_context, _alienEvent, _source, _destination, _primtype, _id) \
162 { \ 162 { \
163 CsrWifiFsmAlienEvent *_evt = (CsrWifiFsmAlienEvent *)CsrPmemAlloc(sizeof(CsrWifiFsmAlienEvent)); \ 163 CsrWifiFsmAlienEvent *_evt = kmalloc(sizeof(CsrWifiFsmAlienEvent), GFP_KERNEL); \
164 _evt->alienEvent = _alienEvent; \ 164 _evt->alienEvent = _alienEvent; \
165 CsrWifiFsmSendEventExternal(_context, (CsrWifiFsmEvent *)_evt, _source, _destination, _primtype, _id); \ 165 CsrWifiFsmSendEventExternal(_context, (CsrWifiFsmEvent *)_evt, _source, _destination, _primtype, _id); \
166 } 166 }
diff --git a/drivers/staging/csr/csr_wifi_hip_card_sdio.c b/drivers/staging/csr/csr_wifi_hip_card_sdio.c
index d4c92814c65d..44ab00c53fec 100644
--- a/drivers/staging/csr/csr_wifi_hip_card_sdio.c
+++ b/drivers/staging/csr/csr_wifi_hip_card_sdio.c
@@ -1655,7 +1655,7 @@ static CsrResult card_allocate_memory_resources(card_t *card)
1655 1655
1656 /* 1656 /*
1657 * Allocate memory for the from-host and to-host bulk data slots. 1657 * Allocate memory for the from-host and to-host bulk data slots.
1658 * This is done as separate CsrPmemAllocs because lots of smaller 1658 * This is done as separate kmallocs because lots of smaller
1659 * allocations are more likely to succeed than one huge one. 1659 * allocations are more likely to succeed than one huge one.
1660 */ 1660 */
1661 1661
diff --git a/drivers/staging/csr/csr_wifi_nme_ap_lib.h b/drivers/staging/csr/csr_wifi_nme_ap_lib.h
index 45b8d267dd00..fed0ea2c0330 100644
--- a/drivers/staging/csr/csr_wifi_nme_ap_lib.h
+++ b/drivers/staging/csr/csr_wifi_nme_ap_lib.h
@@ -95,7 +95,7 @@ extern const char *CsrWifiNmeApDownstreamPrimNames[CSR_WIFI_NME_AP_PRIM_DOWNSTRE
95 95
96*******************************************************************************/ 96*******************************************************************************/
97#define CsrWifiNmeApConfigSetReqCreate(msg__, dst__, src__, apConfig__, apMacConfig__) \ 97#define CsrWifiNmeApConfigSetReqCreate(msg__, dst__, src__, apConfig__, apMacConfig__) \
98 msg__ = (CsrWifiNmeApConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiNmeApConfigSetReq)); \ 98 msg__ = kmalloc(sizeof(CsrWifiNmeApConfigSetReq), GFP_KERNEL); \
99 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_CONFIG_SET_REQ, dst__, src__); \ 99 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_CONFIG_SET_REQ, dst__, src__); \
100 msg__->apConfig = (apConfig__); \ 100 msg__->apConfig = (apConfig__); \
101 msg__->apMacConfig = (apMacConfig__); 101 msg__->apMacConfig = (apMacConfig__);
@@ -124,7 +124,7 @@ extern const char *CsrWifiNmeApDownstreamPrimNames[CSR_WIFI_NME_AP_PRIM_DOWNSTRE
124 124
125*******************************************************************************/ 125*******************************************************************************/
126#define CsrWifiNmeApConfigSetCfmCreate(msg__, dst__, src__, status__) \ 126#define CsrWifiNmeApConfigSetCfmCreate(msg__, dst__, src__, status__) \
127 msg__ = (CsrWifiNmeApConfigSetCfm *) CsrPmemAlloc(sizeof(CsrWifiNmeApConfigSetCfm)); \ 127 msg__ = kmalloc(sizeof(CsrWifiNmeApConfigSetCfm), GFP_KERNEL); \
128 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_CONFIG_SET_CFM, dst__, src__); \ 128 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_CONFIG_SET_CFM, dst__, src__); \
129 msg__->status = (status__); 129 msg__->status = (status__);
130 130
@@ -159,7 +159,7 @@ extern const char *CsrWifiNmeApDownstreamPrimNames[CSR_WIFI_NME_AP_PRIM_DOWNSTRE
159 159
160*******************************************************************************/ 160*******************************************************************************/
161#define CsrWifiNmeApStaRemoveReqCreate(msg__, dst__, src__, interfaceTag__, staMacAddress__, keepBlocking__) \ 161#define CsrWifiNmeApStaRemoveReqCreate(msg__, dst__, src__, interfaceTag__, staMacAddress__, keepBlocking__) \
162 msg__ = (CsrWifiNmeApStaRemoveReq *) CsrPmemAlloc(sizeof(CsrWifiNmeApStaRemoveReq)); \ 162 msg__ = kmalloc(sizeof(CsrWifiNmeApStaRemoveReq), GFP_KERNEL); \
163 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_STA_REMOVE_REQ, dst__, src__); \ 163 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_STA_REMOVE_REQ, dst__, src__); \
164 msg__->interfaceTag = (interfaceTag__); \ 164 msg__->interfaceTag = (interfaceTag__); \
165 msg__->staMacAddress = (staMacAddress__); \ 165 msg__->staMacAddress = (staMacAddress__); \
@@ -199,7 +199,7 @@ extern const char *CsrWifiNmeApDownstreamPrimNames[CSR_WIFI_NME_AP_PRIM_DOWNSTRE
199 199
200*******************************************************************************/ 200*******************************************************************************/
201#define CsrWifiNmeApStartReqCreate(msg__, dst__, src__, interfaceTag__, apType__, cloakSsid__, ssid__, ifIndex__, channel__, apCredentials__, maxConnections__, p2pGoParam__, wpsEnabled__) \ 201#define CsrWifiNmeApStartReqCreate(msg__, dst__, src__, interfaceTag__, apType__, cloakSsid__, ssid__, ifIndex__, channel__, apCredentials__, maxConnections__, p2pGoParam__, wpsEnabled__) \
202 msg__ = (CsrWifiNmeApStartReq *) CsrPmemAlloc(sizeof(CsrWifiNmeApStartReq)); \ 202 msg__ = kmalloc(sizeof(CsrWifiNmeApStartReq), GFP_KERNEL); \
203 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_START_REQ, dst__, src__); \ 203 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_START_REQ, dst__, src__); \
204 msg__->interfaceTag = (interfaceTag__); \ 204 msg__->interfaceTag = (interfaceTag__); \
205 msg__->apType = (apType__); \ 205 msg__->apType = (apType__); \
@@ -238,7 +238,7 @@ extern const char *CsrWifiNmeApDownstreamPrimNames[CSR_WIFI_NME_AP_PRIM_DOWNSTRE
238 238
239*******************************************************************************/ 239*******************************************************************************/
240#define CsrWifiNmeApStartCfmCreate(msg__, dst__, src__, interfaceTag__, status__, ssid__) \ 240#define CsrWifiNmeApStartCfmCreate(msg__, dst__, src__, interfaceTag__, status__, ssid__) \
241 msg__ = (CsrWifiNmeApStartCfm *) CsrPmemAlloc(sizeof(CsrWifiNmeApStartCfm)); \ 241 msg__ = kmalloc(sizeof(CsrWifiNmeApStartCfm), GFP_KERNEL); \
242 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_START_CFM, dst__, src__); \ 242 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_START_CFM, dst__, src__); \
243 msg__->interfaceTag = (interfaceTag__); \ 243 msg__->interfaceTag = (interfaceTag__); \
244 msg__->status = (status__); \ 244 msg__->status = (status__); \
@@ -273,7 +273,7 @@ extern const char *CsrWifiNmeApDownstreamPrimNames[CSR_WIFI_NME_AP_PRIM_DOWNSTRE
273 273
274*******************************************************************************/ 274*******************************************************************************/
275#define CsrWifiNmeApStationIndCreate(msg__, dst__, src__, interfaceTag__, mediaStatus__, peerMacAddress__, peerDeviceAddress__) \ 275#define CsrWifiNmeApStationIndCreate(msg__, dst__, src__, interfaceTag__, mediaStatus__, peerMacAddress__, peerDeviceAddress__) \
276 msg__ = (CsrWifiNmeApStationInd *) CsrPmemAlloc(sizeof(CsrWifiNmeApStationInd)); \ 276 msg__ = kmalloc(sizeof(CsrWifiNmeApStationInd), GFP_KERNEL); \
277 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_STATION_IND, dst__, src__); \ 277 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_STATION_IND, dst__, src__); \
278 msg__->interfaceTag = (interfaceTag__); \ 278 msg__->interfaceTag = (interfaceTag__); \
279 msg__->mediaStatus = (mediaStatus__); \ 279 msg__->mediaStatus = (mediaStatus__); \
@@ -304,7 +304,7 @@ extern const char *CsrWifiNmeApDownstreamPrimNames[CSR_WIFI_NME_AP_PRIM_DOWNSTRE
304 304
305*******************************************************************************/ 305*******************************************************************************/
306#define CsrWifiNmeApStopReqCreate(msg__, dst__, src__, interfaceTag__) \ 306#define CsrWifiNmeApStopReqCreate(msg__, dst__, src__, interfaceTag__) \
307 msg__ = (CsrWifiNmeApStopReq *) CsrPmemAlloc(sizeof(CsrWifiNmeApStopReq)); \ 307 msg__ = kmalloc(sizeof(CsrWifiNmeApStopReq), GFP_KERNEL); \
308 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_STOP_REQ, dst__, src__); \ 308 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_STOP_REQ, dst__, src__); \
309 msg__->interfaceTag = (interfaceTag__); 309 msg__->interfaceTag = (interfaceTag__);
310 310
@@ -336,7 +336,7 @@ extern const char *CsrWifiNmeApDownstreamPrimNames[CSR_WIFI_NME_AP_PRIM_DOWNSTRE
336 336
337*******************************************************************************/ 337*******************************************************************************/
338#define CsrWifiNmeApStopIndCreate(msg__, dst__, src__, interfaceTag__, apType__, status__) \ 338#define CsrWifiNmeApStopIndCreate(msg__, dst__, src__, interfaceTag__, apType__, status__) \
339 msg__ = (CsrWifiNmeApStopInd *) CsrPmemAlloc(sizeof(CsrWifiNmeApStopInd)); \ 339 msg__ = kmalloc(sizeof(CsrWifiNmeApStopInd), GFP_KERNEL); \
340 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_STOP_IND, dst__, src__); \ 340 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_STOP_IND, dst__, src__); \
341 msg__->interfaceTag = (interfaceTag__); \ 341 msg__->interfaceTag = (interfaceTag__); \
342 msg__->apType = (apType__); \ 342 msg__->apType = (apType__); \
@@ -369,7 +369,7 @@ extern const char *CsrWifiNmeApDownstreamPrimNames[CSR_WIFI_NME_AP_PRIM_DOWNSTRE
369 369
370*******************************************************************************/ 370*******************************************************************************/
371#define CsrWifiNmeApStopCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \ 371#define CsrWifiNmeApStopCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \
372 msg__ = (CsrWifiNmeApStopCfm *) CsrPmemAlloc(sizeof(CsrWifiNmeApStopCfm)); \ 372 msg__ = kmalloc(sizeof(CsrWifiNmeApStopCfm), GFP_KERNEL); \
373 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_STOP_CFM, dst__, src__); \ 373 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_STOP_CFM, dst__, src__); \
374 msg__->interfaceTag = (interfaceTag__); \ 374 msg__->interfaceTag = (interfaceTag__); \
375 msg__->status = (status__); 375 msg__->status = (status__);
@@ -402,7 +402,7 @@ extern const char *CsrWifiNmeApDownstreamPrimNames[CSR_WIFI_NME_AP_PRIM_DOWNSTRE
402 402
403*******************************************************************************/ 403*******************************************************************************/
404#define CsrWifiNmeApWmmParamUpdateReqCreate(msg__, dst__, src__, wmmApParams__, wmmApBcParams__) \ 404#define CsrWifiNmeApWmmParamUpdateReqCreate(msg__, dst__, src__, wmmApParams__, wmmApBcParams__) \
405 msg__ = (CsrWifiNmeApWmmParamUpdateReq *) CsrPmemAlloc(sizeof(CsrWifiNmeApWmmParamUpdateReq)); \ 405 msg__ = kmalloc(sizeof(CsrWifiNmeApWmmParamUpdateReq), GFP_KERNEL); \
406 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_WMM_PARAM_UPDATE_REQ, dst__, src__); \ 406 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_WMM_PARAM_UPDATE_REQ, dst__, src__); \
407 memcpy(msg__->wmmApParams, (wmmApParams__), sizeof(CsrWifiSmeWmmAcParams) * 4); \ 407 memcpy(msg__->wmmApParams, (wmmApParams__), sizeof(CsrWifiSmeWmmAcParams) * 4); \
408 memcpy(msg__->wmmApBcParams, (wmmApBcParams__), sizeof(CsrWifiSmeWmmAcParams) * 4); 408 memcpy(msg__->wmmApBcParams, (wmmApBcParams__), sizeof(CsrWifiSmeWmmAcParams) * 4);
@@ -431,7 +431,7 @@ extern const char *CsrWifiNmeApDownstreamPrimNames[CSR_WIFI_NME_AP_PRIM_DOWNSTRE
431 431
432*******************************************************************************/ 432*******************************************************************************/
433#define CsrWifiNmeApWmmParamUpdateCfmCreate(msg__, dst__, src__, status__) \ 433#define CsrWifiNmeApWmmParamUpdateCfmCreate(msg__, dst__, src__, status__) \
434 msg__ = (CsrWifiNmeApWmmParamUpdateCfm *) CsrPmemAlloc(sizeof(CsrWifiNmeApWmmParamUpdateCfm)); \ 434 msg__ = kmalloc(sizeof(CsrWifiNmeApWmmParamUpdateCfm), GFP_KERNEL); \
435 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_WMM_PARAM_UPDATE_CFM, dst__, src__); \ 435 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_WMM_PARAM_UPDATE_CFM, dst__, src__); \
436 msg__->status = (status__); 436 msg__->status = (status__);
437 437
@@ -469,7 +469,7 @@ extern const char *CsrWifiNmeApDownstreamPrimNames[CSR_WIFI_NME_AP_PRIM_DOWNSTRE
469 469
470*******************************************************************************/ 470*******************************************************************************/
471#define CsrWifiNmeApWpsRegisterReqCreate(msg__, dst__, src__, interfaceTag__, selectedDevicePasswordId__, selectedConfigMethod__, pin__) \ 471#define CsrWifiNmeApWpsRegisterReqCreate(msg__, dst__, src__, interfaceTag__, selectedDevicePasswordId__, selectedConfigMethod__, pin__) \
472 msg__ = (CsrWifiNmeApWpsRegisterReq *) CsrPmemAlloc(sizeof(CsrWifiNmeApWpsRegisterReq)); \ 472 msg__ = kmalloc(sizeof(CsrWifiNmeApWpsRegisterReq), GFP_KERNEL); \
473 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_WPS_REGISTER_REQ, dst__, src__); \ 473 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_WPS_REGISTER_REQ, dst__, src__); \
474 msg__->interfaceTag = (interfaceTag__); \ 474 msg__->interfaceTag = (interfaceTag__); \
475 msg__->selectedDevicePasswordId = (selectedDevicePasswordId__); \ 475 msg__->selectedDevicePasswordId = (selectedDevicePasswordId__); \
@@ -501,7 +501,7 @@ extern const char *CsrWifiNmeApDownstreamPrimNames[CSR_WIFI_NME_AP_PRIM_DOWNSTRE
501 501
502*******************************************************************************/ 502*******************************************************************************/
503#define CsrWifiNmeApWpsRegisterCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \ 503#define CsrWifiNmeApWpsRegisterCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \
504 msg__ = (CsrWifiNmeApWpsRegisterCfm *) CsrPmemAlloc(sizeof(CsrWifiNmeApWpsRegisterCfm)); \ 504 msg__ = kmalloc(sizeof(CsrWifiNmeApWpsRegisterCfm), GFP_KERNEL); \
505 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_WPS_REGISTER_CFM, dst__, src__); \ 505 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_AP_PRIM, CSR_WIFI_NME_AP_WPS_REGISTER_CFM, dst__, src__); \
506 msg__->interfaceTag = (interfaceTag__); \ 506 msg__->interfaceTag = (interfaceTag__); \
507 msg__->status = (status__); 507 msg__->status = (status__);
diff --git a/drivers/staging/csr/csr_wifi_nme_ap_serialize.c b/drivers/staging/csr/csr_wifi_nme_ap_serialize.c
index dcdcc32b597c..8112aa04328b 100644
--- a/drivers/staging/csr/csr_wifi_nme_ap_serialize.c
+++ b/drivers/staging/csr/csr_wifi_nme_ap_serialize.c
@@ -152,7 +152,7 @@ u8* CsrWifiNmeApConfigSetReqSer(u8 *ptr, size_t *len, void *msg)
152 152
153void* CsrWifiNmeApConfigSetReqDes(u8 *buffer, size_t length) 153void* CsrWifiNmeApConfigSetReqDes(u8 *buffer, size_t length)
154{ 154{
155 CsrWifiNmeApConfigSetReq *primitive = (CsrWifiNmeApConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiNmeApConfigSetReq)); 155 CsrWifiNmeApConfigSetReq *primitive = kmalloc(sizeof(CsrWifiNmeApConfigSetReq), GFP_KERNEL);
156 size_t offset; 156 size_t offset;
157 offset = 0; 157 offset = 0;
158 158
@@ -199,7 +199,7 @@ void* CsrWifiNmeApConfigSetReqDes(u8 *buffer, size_t length)
199 primitive->apMacConfig.macAddressList = NULL; 199 primitive->apMacConfig.macAddressList = NULL;
200 if (primitive->apMacConfig.macAddressListCount) 200 if (primitive->apMacConfig.macAddressListCount)
201 { 201 {
202 primitive->apMacConfig.macAddressList = (CsrWifiMacAddress *)CsrPmemAlloc(sizeof(CsrWifiMacAddress) * primitive->apMacConfig.macAddressListCount); 202 primitive->apMacConfig.macAddressList = kmalloc(sizeof(CsrWifiMacAddress) * primitive->apMacConfig.macAddressListCount, GFP_KERNEL);
203 } 203 }
204 { 204 {
205 u16 i2; 205 u16 i2;
@@ -255,7 +255,7 @@ u8* CsrWifiNmeApWpsRegisterReqSer(u8 *ptr, size_t *len, void *msg)
255 255
256void* CsrWifiNmeApWpsRegisterReqDes(u8 *buffer, size_t length) 256void* CsrWifiNmeApWpsRegisterReqDes(u8 *buffer, size_t length)
257{ 257{
258 CsrWifiNmeApWpsRegisterReq *primitive = (CsrWifiNmeApWpsRegisterReq *) CsrPmemAlloc(sizeof(CsrWifiNmeApWpsRegisterReq)); 258 CsrWifiNmeApWpsRegisterReq *primitive = kmalloc(sizeof(CsrWifiNmeApWpsRegisterReq), GFP_KERNEL);
259 size_t offset; 259 size_t offset;
260 offset = 0; 260 offset = 0;
261 261
@@ -447,7 +447,7 @@ u8* CsrWifiNmeApStartReqSer(u8 *ptr, size_t *len, void *msg)
447 447
448void* CsrWifiNmeApStartReqDes(u8 *buffer, size_t length) 448void* CsrWifiNmeApStartReqDes(u8 *buffer, size_t length)
449{ 449{
450 CsrWifiNmeApStartReq *primitive = (CsrWifiNmeApStartReq *) CsrPmemAlloc(sizeof(CsrWifiNmeApStartReq)); 450 CsrWifiNmeApStartReq *primitive = kmalloc(sizeof(CsrWifiNmeApStartReq), GFP_KERNEL);
451 size_t offset; 451 size_t offset;
452 offset = 0; 452 offset = 0;
453 453
@@ -518,7 +518,7 @@ void* CsrWifiNmeApStartReqDes(u8 *buffer, size_t length)
518 primitive->p2pGoParam.operatingChanList.channelEntryList = NULL; 518 primitive->p2pGoParam.operatingChanList.channelEntryList = NULL;
519 if (primitive->p2pGoParam.operatingChanList.channelEntryListCount) 519 if (primitive->p2pGoParam.operatingChanList.channelEntryListCount)
520 { 520 {
521 primitive->p2pGoParam.operatingChanList.channelEntryList = (CsrWifiSmeApP2pOperatingChanEntry *)CsrPmemAlloc(sizeof(CsrWifiSmeApP2pOperatingChanEntry) * primitive->p2pGoParam.operatingChanList.channelEntryListCount); 521 primitive->p2pGoParam.operatingChanList.channelEntryList = kmalloc(sizeof(CsrWifiSmeApP2pOperatingChanEntry) * primitive->p2pGoParam.operatingChanList.channelEntryListCount, GFP_KERNEL);
522 } 522 }
523 { 523 {
524 u16 i3; 524 u16 i3;
@@ -528,7 +528,7 @@ void* CsrWifiNmeApStartReqDes(u8 *buffer, size_t length)
528 CsrUint8Des((u8 *) &primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannelCount, buffer, &offset); 528 CsrUint8Des((u8 *) &primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannelCount, buffer, &offset);
529 if (primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannelCount) 529 if (primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannelCount)
530 { 530 {
531 primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannel = (u8 *)CsrPmemAlloc(primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannelCount); 531 primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannel = kmalloc(primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannelCount, GFP_KERNEL);
532 CsrMemCpyDes(primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannel, buffer, &offset, ((u16) (primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannelCount))); 532 CsrMemCpyDes(primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannel, buffer, &offset, ((u16) (primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannelCount)));
533 } 533 }
534 else 534 else
@@ -641,7 +641,7 @@ u8* CsrWifiNmeApWmmParamUpdateReqSer(u8 *ptr, size_t *len, void *msg)
641 641
642void* CsrWifiNmeApWmmParamUpdateReqDes(u8 *buffer, size_t length) 642void* CsrWifiNmeApWmmParamUpdateReqDes(u8 *buffer, size_t length)
643{ 643{
644 CsrWifiNmeApWmmParamUpdateReq *primitive = (CsrWifiNmeApWmmParamUpdateReq *) CsrPmemAlloc(sizeof(CsrWifiNmeApWmmParamUpdateReq)); 644 CsrWifiNmeApWmmParamUpdateReq *primitive = kmalloc(sizeof(CsrWifiNmeApWmmParamUpdateReq), GFP_KERNEL);
645 size_t offset; 645 size_t offset;
646 offset = 0; 646 offset = 0;
647 647
@@ -699,7 +699,7 @@ u8* CsrWifiNmeApStaRemoveReqSer(u8 *ptr, size_t *len, void *msg)
699 699
700void* CsrWifiNmeApStaRemoveReqDes(u8 *buffer, size_t length) 700void* CsrWifiNmeApStaRemoveReqDes(u8 *buffer, size_t length)
701{ 701{
702 CsrWifiNmeApStaRemoveReq *primitive = (CsrWifiNmeApStaRemoveReq *) CsrPmemAlloc(sizeof(CsrWifiNmeApStaRemoveReq)); 702 CsrWifiNmeApStaRemoveReq *primitive = kmalloc(sizeof(CsrWifiNmeApStaRemoveReq), GFP_KERNEL);
703 size_t offset; 703 size_t offset;
704 offset = 0; 704 offset = 0;
705 705
@@ -736,7 +736,7 @@ u8* CsrWifiNmeApWpsRegisterCfmSer(u8 *ptr, size_t *len, void *msg)
736 736
737void* CsrWifiNmeApWpsRegisterCfmDes(u8 *buffer, size_t length) 737void* CsrWifiNmeApWpsRegisterCfmDes(u8 *buffer, size_t length)
738{ 738{
739 CsrWifiNmeApWpsRegisterCfm *primitive = (CsrWifiNmeApWpsRegisterCfm *) CsrPmemAlloc(sizeof(CsrWifiNmeApWpsRegisterCfm)); 739 CsrWifiNmeApWpsRegisterCfm *primitive = kmalloc(sizeof(CsrWifiNmeApWpsRegisterCfm), GFP_KERNEL);
740 size_t offset; 740 size_t offset;
741 offset = 0; 741 offset = 0;
742 742
@@ -776,7 +776,7 @@ u8* CsrWifiNmeApStartCfmSer(u8 *ptr, size_t *len, void *msg)
776 776
777void* CsrWifiNmeApStartCfmDes(u8 *buffer, size_t length) 777void* CsrWifiNmeApStartCfmDes(u8 *buffer, size_t length)
778{ 778{
779 CsrWifiNmeApStartCfm *primitive = (CsrWifiNmeApStartCfm *) CsrPmemAlloc(sizeof(CsrWifiNmeApStartCfm)); 779 CsrWifiNmeApStartCfm *primitive = kmalloc(sizeof(CsrWifiNmeApStartCfm), GFP_KERNEL);
780 size_t offset; 780 size_t offset;
781 offset = 0; 781 offset = 0;
782 782
@@ -814,7 +814,7 @@ u8* CsrWifiNmeApStopCfmSer(u8 *ptr, size_t *len, void *msg)
814 814
815void* CsrWifiNmeApStopCfmDes(u8 *buffer, size_t length) 815void* CsrWifiNmeApStopCfmDes(u8 *buffer, size_t length)
816{ 816{
817 CsrWifiNmeApStopCfm *primitive = (CsrWifiNmeApStopCfm *) CsrPmemAlloc(sizeof(CsrWifiNmeApStopCfm)); 817 CsrWifiNmeApStopCfm *primitive = kmalloc(sizeof(CsrWifiNmeApStopCfm), GFP_KERNEL);
818 size_t offset; 818 size_t offset;
819 offset = 0; 819 offset = 0;
820 820
@@ -852,7 +852,7 @@ u8* CsrWifiNmeApStopIndSer(u8 *ptr, size_t *len, void *msg)
852 852
853void* CsrWifiNmeApStopIndDes(u8 *buffer, size_t length) 853void* CsrWifiNmeApStopIndDes(u8 *buffer, size_t length)
854{ 854{
855 CsrWifiNmeApStopInd *primitive = (CsrWifiNmeApStopInd *) CsrPmemAlloc(sizeof(CsrWifiNmeApStopInd)); 855 CsrWifiNmeApStopInd *primitive = kmalloc(sizeof(CsrWifiNmeApStopInd), GFP_KERNEL);
856 size_t offset; 856 size_t offset;
857 offset = 0; 857 offset = 0;
858 858
@@ -893,7 +893,7 @@ u8* CsrWifiNmeApStationIndSer(u8 *ptr, size_t *len, void *msg)
893 893
894void* CsrWifiNmeApStationIndDes(u8 *buffer, size_t length) 894void* CsrWifiNmeApStationIndDes(u8 *buffer, size_t length)
895{ 895{
896 CsrWifiNmeApStationInd *primitive = (CsrWifiNmeApStationInd *) CsrPmemAlloc(sizeof(CsrWifiNmeApStationInd)); 896 CsrWifiNmeApStationInd *primitive = kmalloc(sizeof(CsrWifiNmeApStationInd), GFP_KERNEL);
897 size_t offset; 897 size_t offset;
898 offset = 0; 898 offset = 0;
899 899
diff --git a/drivers/staging/csr/csr_wifi_nme_lib.h b/drivers/staging/csr/csr_wifi_nme_lib.h
index 4d8f3f14ce6a..04b7c31342c8 100644
--- a/drivers/staging/csr/csr_wifi_nme_lib.h
+++ b/drivers/staging/csr/csr_wifi_nme_lib.h
@@ -100,7 +100,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO
100 100
101*******************************************************************************/ 101*******************************************************************************/
102#define CsrWifiNmeConnectionStatusGetReqCreate(msg__, dst__, src__, interfaceTag__) \ 102#define CsrWifiNmeConnectionStatusGetReqCreate(msg__, dst__, src__, interfaceTag__) \
103 msg__ = (CsrWifiNmeConnectionStatusGetReq *) CsrPmemAlloc(sizeof(CsrWifiNmeConnectionStatusGetReq)); \ 103 msg__ = kmalloc(sizeof(CsrWifiNmeConnectionStatusGetReq), GFP_KERNEL); \
104 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_CONNECTION_STATUS_GET_REQ, dst__, src__); \ 104 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_CONNECTION_STATUS_GET_REQ, dst__, src__); \
105 msg__->interfaceTag = (interfaceTag__); 105 msg__->interfaceTag = (interfaceTag__);
106 106
@@ -131,7 +131,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO
131 131
132*******************************************************************************/ 132*******************************************************************************/
133#define CsrWifiNmeConnectionStatusGetCfmCreate(msg__, dst__, src__, interfaceTag__, status__, connectionStatus__) \ 133#define CsrWifiNmeConnectionStatusGetCfmCreate(msg__, dst__, src__, interfaceTag__, status__, connectionStatus__) \
134 msg__ = (CsrWifiNmeConnectionStatusGetCfm *) CsrPmemAlloc(sizeof(CsrWifiNmeConnectionStatusGetCfm)); \ 134 msg__ = kmalloc(sizeof(CsrWifiNmeConnectionStatusGetCfm), GFP_KERNEL); \
135 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_CONNECTION_STATUS_GET_CFM, dst__, src__); \ 135 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_CONNECTION_STATUS_GET_CFM, dst__, src__); \
136 msg__->interfaceTag = (interfaceTag__); \ 136 msg__->interfaceTag = (interfaceTag__); \
137 msg__->status = (status__); \ 137 msg__->status = (status__); \
@@ -164,7 +164,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO
164 164
165*******************************************************************************/ 165*******************************************************************************/
166#define CsrWifiNmeEventMaskSetReqCreate(msg__, dst__, src__, indMask__) \ 166#define CsrWifiNmeEventMaskSetReqCreate(msg__, dst__, src__, indMask__) \
167 msg__ = (CsrWifiNmeEventMaskSetReq *) CsrPmemAlloc(sizeof(CsrWifiNmeEventMaskSetReq)); \ 167 msg__ = kmalloc(sizeof(CsrWifiNmeEventMaskSetReq), GFP_KERNEL); \
168 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_EVENT_MASK_SET_REQ, dst__, src__); \ 168 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_EVENT_MASK_SET_REQ, dst__, src__); \
169 msg__->indMask = (indMask__); 169 msg__->indMask = (indMask__);
170 170
@@ -193,7 +193,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO
193 193
194*******************************************************************************/ 194*******************************************************************************/
195#define CsrWifiNmeEventMaskSetCfmCreate(msg__, dst__, src__, status__) \ 195#define CsrWifiNmeEventMaskSetCfmCreate(msg__, dst__, src__, status__) \
196 msg__ = (CsrWifiNmeEventMaskSetCfm *) CsrPmemAlloc(sizeof(CsrWifiNmeEventMaskSetCfm)); \ 196 msg__ = kmalloc(sizeof(CsrWifiNmeEventMaskSetCfm), GFP_KERNEL); \
197 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_EVENT_MASK_SET_CFM, dst__, src__); \ 197 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_EVENT_MASK_SET_CFM, dst__, src__); \
198 msg__->status = (status__); 198 msg__->status = (status__);
199 199
@@ -224,7 +224,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO
224 224
225*******************************************************************************/ 225*******************************************************************************/
226#define CsrWifiNmeProfileConnectReqCreate(msg__, dst__, src__, interfaceTag__, profileIdentity__) \ 226#define CsrWifiNmeProfileConnectReqCreate(msg__, dst__, src__, interfaceTag__, profileIdentity__) \
227 msg__ = (CsrWifiNmeProfileConnectReq *) CsrPmemAlloc(sizeof(CsrWifiNmeProfileConnectReq)); \ 227 msg__ = kmalloc(sizeof(CsrWifiNmeProfileConnectReq), GFP_KERNEL); \
228 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_PROFILE_CONNECT_REQ, dst__, src__); \ 228 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_PROFILE_CONNECT_REQ, dst__, src__); \
229 msg__->interfaceTag = (interfaceTag__); \ 229 msg__->interfaceTag = (interfaceTag__); \
230 msg__->profileIdentity = (profileIdentity__); 230 msg__->profileIdentity = (profileIdentity__);
@@ -269,7 +269,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO
269 269
270*******************************************************************************/ 270*******************************************************************************/
271#define CsrWifiNmeProfileConnectCfmCreate(msg__, dst__, src__, interfaceTag__, status__, connectAttemptsCount__, connectAttempts__) \ 271#define CsrWifiNmeProfileConnectCfmCreate(msg__, dst__, src__, interfaceTag__, status__, connectAttemptsCount__, connectAttempts__) \
272 msg__ = (CsrWifiNmeProfileConnectCfm *) CsrPmemAlloc(sizeof(CsrWifiNmeProfileConnectCfm)); \ 272 msg__ = kmalloc(sizeof(CsrWifiNmeProfileConnectCfm), GFP_KERNEL); \
273 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_PROFILE_CONNECT_CFM, dst__, src__); \ 273 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_PROFILE_CONNECT_CFM, dst__, src__); \
274 msg__->interfaceTag = (interfaceTag__); \ 274 msg__->interfaceTag = (interfaceTag__); \
275 msg__->status = (status__); \ 275 msg__->status = (status__); \
@@ -300,7 +300,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO
300 300
301*******************************************************************************/ 301*******************************************************************************/
302#define CsrWifiNmeProfileDeleteAllReqCreate(msg__, dst__, src__) \ 302#define CsrWifiNmeProfileDeleteAllReqCreate(msg__, dst__, src__) \
303 msg__ = (CsrWifiNmeProfileDeleteAllReq *) CsrPmemAlloc(sizeof(CsrWifiNmeProfileDeleteAllReq)); \ 303 msg__ = kmalloc(sizeof(CsrWifiNmeProfileDeleteAllReq), GFP_KERNEL); \
304 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_PROFILE_DELETE_ALL_REQ, dst__, src__); 304 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_PROFILE_DELETE_ALL_REQ, dst__, src__);
305 305
306#define CsrWifiNmeProfileDeleteAllReqSendTo(dst__, src__) \ 306#define CsrWifiNmeProfileDeleteAllReqSendTo(dst__, src__) \
@@ -329,7 +329,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO
329 329
330*******************************************************************************/ 330*******************************************************************************/
331#define CsrWifiNmeProfileDeleteAllCfmCreate(msg__, dst__, src__, status__) \ 331#define CsrWifiNmeProfileDeleteAllCfmCreate(msg__, dst__, src__, status__) \
332 msg__ = (CsrWifiNmeProfileDeleteAllCfm *) CsrPmemAlloc(sizeof(CsrWifiNmeProfileDeleteAllCfm)); \ 332 msg__ = kmalloc(sizeof(CsrWifiNmeProfileDeleteAllCfm), GFP_KERNEL); \
333 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_PROFILE_DELETE_ALL_CFM, dst__, src__); \ 333 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_PROFILE_DELETE_ALL_CFM, dst__, src__); \
334 msg__->status = (status__); 334 msg__->status = (status__);
335 335
@@ -358,7 +358,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO
358 358
359*******************************************************************************/ 359*******************************************************************************/
360#define CsrWifiNmeProfileDeleteReqCreate(msg__, dst__, src__, profileIdentity__) \ 360#define CsrWifiNmeProfileDeleteReqCreate(msg__, dst__, src__, profileIdentity__) \
361 msg__ = (CsrWifiNmeProfileDeleteReq *) CsrPmemAlloc(sizeof(CsrWifiNmeProfileDeleteReq)); \ 361 msg__ = kmalloc(sizeof(CsrWifiNmeProfileDeleteReq), GFP_KERNEL); \
362 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_PROFILE_DELETE_REQ, dst__, src__); \ 362 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_PROFILE_DELETE_REQ, dst__, src__); \
363 msg__->profileIdentity = (profileIdentity__); 363 msg__->profileIdentity = (profileIdentity__);
364 364
@@ -387,7 +387,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO
387 387
388*******************************************************************************/ 388*******************************************************************************/
389#define CsrWifiNmeProfileDeleteCfmCreate(msg__, dst__, src__, status__) \ 389#define CsrWifiNmeProfileDeleteCfmCreate(msg__, dst__, src__, status__) \
390 msg__ = (CsrWifiNmeProfileDeleteCfm *) CsrPmemAlloc(sizeof(CsrWifiNmeProfileDeleteCfm)); \ 390 msg__ = kmalloc(sizeof(CsrWifiNmeProfileDeleteCfm), GFP_KERNEL); \
391 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_PROFILE_DELETE_CFM, dst__, src__); \ 391 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_PROFILE_DELETE_CFM, dst__, src__); \
392 msg__->status = (status__); 392 msg__->status = (status__);
393 393
@@ -427,7 +427,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO
427 427
428*******************************************************************************/ 428*******************************************************************************/
429#define CsrWifiNmeProfileDisconnectIndCreate(msg__, dst__, src__, interfaceTag__, connectAttemptsCount__, connectAttempts__) \ 429#define CsrWifiNmeProfileDisconnectIndCreate(msg__, dst__, src__, interfaceTag__, connectAttemptsCount__, connectAttempts__) \
430 msg__ = (CsrWifiNmeProfileDisconnectInd *) CsrPmemAlloc(sizeof(CsrWifiNmeProfileDisconnectInd)); \ 430 msg__ = kmalloc(sizeof(CsrWifiNmeProfileDisconnectInd), GFP_KERNEL); \
431 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_PROFILE_DISCONNECT_IND, dst__, src__); \ 431 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_PROFILE_DISCONNECT_IND, dst__, src__); \
432 msg__->interfaceTag = (interfaceTag__); \ 432 msg__->interfaceTag = (interfaceTag__); \
433 msg__->connectAttemptsCount = (connectAttemptsCount__); \ 433 msg__->connectAttemptsCount = (connectAttemptsCount__); \
@@ -469,7 +469,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO
469 469
470*******************************************************************************/ 470*******************************************************************************/
471#define CsrWifiNmeProfileOrderSetReqCreate(msg__, dst__, src__, interfaceTag__, profileIdentitysCount__, profileIdentitys__) \ 471#define CsrWifiNmeProfileOrderSetReqCreate(msg__, dst__, src__, interfaceTag__, profileIdentitysCount__, profileIdentitys__) \
472 msg__ = (CsrWifiNmeProfileOrderSetReq *) CsrPmemAlloc(sizeof(CsrWifiNmeProfileOrderSetReq)); \ 472 msg__ = kmalloc(sizeof(CsrWifiNmeProfileOrderSetReq), GFP_KERNEL); \
473 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_PROFILE_ORDER_SET_REQ, dst__, src__); \ 473 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_PROFILE_ORDER_SET_REQ, dst__, src__); \
474 msg__->interfaceTag = (interfaceTag__); \ 474 msg__->interfaceTag = (interfaceTag__); \
475 msg__->profileIdentitysCount = (profileIdentitysCount__); \ 475 msg__->profileIdentitysCount = (profileIdentitysCount__); \
@@ -501,7 +501,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO
501 501
502*******************************************************************************/ 502*******************************************************************************/
503#define CsrWifiNmeProfileOrderSetCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \ 503#define CsrWifiNmeProfileOrderSetCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \
504 msg__ = (CsrWifiNmeProfileOrderSetCfm *) CsrPmemAlloc(sizeof(CsrWifiNmeProfileOrderSetCfm)); \ 504 msg__ = kmalloc(sizeof(CsrWifiNmeProfileOrderSetCfm), GFP_KERNEL); \
505 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_PROFILE_ORDER_SET_CFM, dst__, src__); \ 505 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_PROFILE_ORDER_SET_CFM, dst__, src__); \
506 msg__->interfaceTag = (interfaceTag__); \ 506 msg__->interfaceTag = (interfaceTag__); \
507 msg__->status = (status__); 507 msg__->status = (status__);
@@ -535,7 +535,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO
535 535
536*******************************************************************************/ 536*******************************************************************************/
537#define CsrWifiNmeProfileSetReqCreate(msg__, dst__, src__, profile__) \ 537#define CsrWifiNmeProfileSetReqCreate(msg__, dst__, src__, profile__) \
538 msg__ = (CsrWifiNmeProfileSetReq *) CsrPmemAlloc(sizeof(CsrWifiNmeProfileSetReq)); \ 538 msg__ = kmalloc(sizeof(CsrWifiNmeProfileSetReq), GFP_KERNEL); \
539 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_PROFILE_SET_REQ, dst__, src__); \ 539 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_PROFILE_SET_REQ, dst__, src__); \
540 msg__->profile = (profile__); 540 msg__->profile = (profile__);
541 541
@@ -568,7 +568,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO
568 568
569*******************************************************************************/ 569*******************************************************************************/
570#define CsrWifiNmeProfileSetCfmCreate(msg__, dst__, src__, status__) \ 570#define CsrWifiNmeProfileSetCfmCreate(msg__, dst__, src__, status__) \
571 msg__ = (CsrWifiNmeProfileSetCfm *) CsrPmemAlloc(sizeof(CsrWifiNmeProfileSetCfm)); \ 571 msg__ = kmalloc(sizeof(CsrWifiNmeProfileSetCfm), GFP_KERNEL); \
572 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_PROFILE_SET_CFM, dst__, src__); \ 572 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_PROFILE_SET_CFM, dst__, src__); \
573 msg__->status = (status__); 573 msg__->status = (status__);
574 574
@@ -603,7 +603,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO
603 603
604*******************************************************************************/ 604*******************************************************************************/
605#define CsrWifiNmeProfileUpdateIndCreate(msg__, dst__, src__, interfaceTag__, profile__) \ 605#define CsrWifiNmeProfileUpdateIndCreate(msg__, dst__, src__, interfaceTag__, profile__) \
606 msg__ = (CsrWifiNmeProfileUpdateInd *) CsrPmemAlloc(sizeof(CsrWifiNmeProfileUpdateInd)); \ 606 msg__ = kmalloc(sizeof(CsrWifiNmeProfileUpdateInd), GFP_KERNEL); \
607 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_PROFILE_UPDATE_IND, dst__, src__); \ 607 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_PROFILE_UPDATE_IND, dst__, src__); \
608 msg__->interfaceTag = (interfaceTag__); \ 608 msg__->interfaceTag = (interfaceTag__); \
609 msg__->profile = (profile__); 609 msg__->profile = (profile__);
@@ -642,7 +642,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO
642 642
643*******************************************************************************/ 643*******************************************************************************/
644#define CsrWifiNmeSimGsmAuthIndCreate(msg__, dst__, src__, randsLength__, rands__) \ 644#define CsrWifiNmeSimGsmAuthIndCreate(msg__, dst__, src__, randsLength__, rands__) \
645 msg__ = (CsrWifiNmeSimGsmAuthInd *) CsrPmemAlloc(sizeof(CsrWifiNmeSimGsmAuthInd)); \ 645 msg__ = kmalloc(sizeof(CsrWifiNmeSimGsmAuthInd), GFP_KERNEL); \
646 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_SIM_GSM_AUTH_IND, dst__, src__); \ 646 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_SIM_GSM_AUTH_IND, dst__, src__); \
647 msg__->randsLength = (randsLength__); \ 647 msg__->randsLength = (randsLength__); \
648 msg__->rands = (rands__); 648 msg__->rands = (rands__);
@@ -682,7 +682,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO
682 682
683*******************************************************************************/ 683*******************************************************************************/
684#define CsrWifiNmeSimGsmAuthResCreate(msg__, dst__, src__, status__, kcsLength__, kcs__, sresLength__, sres__) \ 684#define CsrWifiNmeSimGsmAuthResCreate(msg__, dst__, src__, status__, kcsLength__, kcs__, sresLength__, sres__) \
685 msg__ = (CsrWifiNmeSimGsmAuthRes *) CsrPmemAlloc(sizeof(CsrWifiNmeSimGsmAuthRes)); \ 685 msg__ = kmalloc(sizeof(CsrWifiNmeSimGsmAuthRes), GFP_KERNEL); \
686 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_SIM_GSM_AUTH_RES, dst__, src__); \ 686 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_SIM_GSM_AUTH_RES, dst__, src__); \
687 msg__->status = (status__); \ 687 msg__->status = (status__); \
688 msg__->kcsLength = (kcsLength__); \ 688 msg__->kcsLength = (kcsLength__); \
@@ -719,7 +719,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO
719 719
720*******************************************************************************/ 720*******************************************************************************/
721#define CsrWifiNmeSimImsiGetIndCreate(msg__, dst__, src__) \ 721#define CsrWifiNmeSimImsiGetIndCreate(msg__, dst__, src__) \
722 msg__ = (CsrWifiNmeSimImsiGetInd *) CsrPmemAlloc(sizeof(CsrWifiNmeSimImsiGetInd)); \ 722 msg__ = kmalloc(sizeof(CsrWifiNmeSimImsiGetInd), GFP_KERNEL); \
723 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_SIM_IMSI_GET_IND, dst__, src__); 723 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_SIM_IMSI_GET_IND, dst__, src__);
724 724
725#define CsrWifiNmeSimImsiGetIndSendTo(dst__, src__) \ 725#define CsrWifiNmeSimImsiGetIndSendTo(dst__, src__) \
@@ -748,7 +748,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO
748 748
749*******************************************************************************/ 749*******************************************************************************/
750#define CsrWifiNmeSimImsiGetResCreate(msg__, dst__, src__, status__, imsi__, cardType__) \ 750#define CsrWifiNmeSimImsiGetResCreate(msg__, dst__, src__, status__, imsi__, cardType__) \
751 msg__ = (CsrWifiNmeSimImsiGetRes *) CsrPmemAlloc(sizeof(CsrWifiNmeSimImsiGetRes)); \ 751 msg__ = kmalloc(sizeof(CsrWifiNmeSimImsiGetRes), GFP_KERNEL); \
752 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_SIM_IMSI_GET_RES, dst__, src__); \ 752 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_SIM_IMSI_GET_RES, dst__, src__); \
753 msg__->status = (status__); \ 753 msg__->status = (status__); \
754 msg__->imsi = (imsi__); \ 754 msg__->imsi = (imsi__); \
@@ -787,7 +787,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO
787 787
788*******************************************************************************/ 788*******************************************************************************/
789#define CsrWifiNmeSimUmtsAuthIndCreate(msg__, dst__, src__, rand__, autn__) \ 789#define CsrWifiNmeSimUmtsAuthIndCreate(msg__, dst__, src__, rand__, autn__) \
790 msg__ = (CsrWifiNmeSimUmtsAuthInd *) CsrPmemAlloc(sizeof(CsrWifiNmeSimUmtsAuthInd)); \ 790 msg__ = kmalloc(sizeof(CsrWifiNmeSimUmtsAuthInd), GFP_KERNEL); \
791 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_SIM_UMTS_AUTH_IND, dst__, src__); \ 791 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_SIM_UMTS_AUTH_IND, dst__, src__); \
792 memcpy(msg__->rand, (rand__), sizeof(u8) * 16); \ 792 memcpy(msg__->rand, (rand__), sizeof(u8) * 16); \
793 memcpy(msg__->autn, (autn__), sizeof(u8) * 16); 793 memcpy(msg__->autn, (autn__), sizeof(u8) * 16);
@@ -834,7 +834,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO
834 834
835*******************************************************************************/ 835*******************************************************************************/
836#define CsrWifiNmeSimUmtsAuthResCreate(msg__, dst__, src__, status__, result__, umtsCipherKey__, umtsIntegrityKey__, resParameterLength__, resParameter__, auts__) \ 836#define CsrWifiNmeSimUmtsAuthResCreate(msg__, dst__, src__, status__, result__, umtsCipherKey__, umtsIntegrityKey__, resParameterLength__, resParameter__, auts__) \
837 msg__ = (CsrWifiNmeSimUmtsAuthRes *) CsrPmemAlloc(sizeof(CsrWifiNmeSimUmtsAuthRes)); \ 837 msg__ = kmalloc(sizeof(CsrWifiNmeSimUmtsAuthRes), GFP_KERNEL); \
838 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_SIM_UMTS_AUTH_RES, dst__, src__); \ 838 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_SIM_UMTS_AUTH_RES, dst__, src__); \
839 msg__->status = (status__); \ 839 msg__->status = (status__); \
840 msg__->result = (result__); \ 840 msg__->result = (result__); \
@@ -870,7 +870,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO
870 870
871*******************************************************************************/ 871*******************************************************************************/
872#define CsrWifiNmeWpsCancelReqCreate(msg__, dst__, src__, interfaceTag__) \ 872#define CsrWifiNmeWpsCancelReqCreate(msg__, dst__, src__, interfaceTag__) \
873 msg__ = (CsrWifiNmeWpsCancelReq *) CsrPmemAlloc(sizeof(CsrWifiNmeWpsCancelReq)); \ 873 msg__ = kmalloc(sizeof(CsrWifiNmeWpsCancelReq), GFP_KERNEL); \
874 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_WPS_CANCEL_REQ, dst__, src__); \ 874 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_WPS_CANCEL_REQ, dst__, src__); \
875 msg__->interfaceTag = (interfaceTag__); 875 msg__->interfaceTag = (interfaceTag__);
876 876
@@ -899,7 +899,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO
899 899
900*******************************************************************************/ 900*******************************************************************************/
901#define CsrWifiNmeWpsCancelCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \ 901#define CsrWifiNmeWpsCancelCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \
902 msg__ = (CsrWifiNmeWpsCancelCfm *) CsrPmemAlloc(sizeof(CsrWifiNmeWpsCancelCfm)); \ 902 msg__ = kmalloc(sizeof(CsrWifiNmeWpsCancelCfm), GFP_KERNEL); \
903 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_WPS_CANCEL_CFM, dst__, src__); \ 903 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_WPS_CANCEL_CFM, dst__, src__); \
904 msg__->interfaceTag = (interfaceTag__); \ 904 msg__->interfaceTag = (interfaceTag__); \
905 msg__->status = (status__); 905 msg__->status = (status__);
@@ -935,7 +935,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO
935 935
936*******************************************************************************/ 936*******************************************************************************/
937#define CsrWifiNmeWpsCfmCreate(msg__, dst__, src__, interfaceTag__, status__, profile__) \ 937#define CsrWifiNmeWpsCfmCreate(msg__, dst__, src__, interfaceTag__, status__, profile__) \
938 msg__ = (CsrWifiNmeWpsCfm *) CsrPmemAlloc(sizeof(CsrWifiNmeWpsCfm)); \ 938 msg__ = kmalloc(sizeof(CsrWifiNmeWpsCfm), GFP_KERNEL); \
939 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_WPS_CFM, dst__, src__); \ 939 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_WPS_CFM, dst__, src__); \
940 msg__->interfaceTag = (interfaceTag__); \ 940 msg__->interfaceTag = (interfaceTag__); \
941 msg__->status = (status__); \ 941 msg__->status = (status__); \
@@ -966,7 +966,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO
966 966
967*******************************************************************************/ 967*******************************************************************************/
968#define CsrWifiNmeWpsConfigSetReqCreate(msg__, dst__, src__, wpsConfig__) \ 968#define CsrWifiNmeWpsConfigSetReqCreate(msg__, dst__, src__, wpsConfig__) \
969 msg__ = (CsrWifiNmeWpsConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiNmeWpsConfigSetReq)); \ 969 msg__ = kmalloc(sizeof(CsrWifiNmeWpsConfigSetReq), GFP_KERNEL); \
970 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_WPS_CONFIG_SET_REQ, dst__, src__); \ 970 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_WPS_CONFIG_SET_REQ, dst__, src__); \
971 msg__->wpsConfig = (wpsConfig__); 971 msg__->wpsConfig = (wpsConfig__);
972 972
@@ -994,7 +994,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO
994 994
995*******************************************************************************/ 995*******************************************************************************/
996#define CsrWifiNmeWpsConfigSetCfmCreate(msg__, dst__, src__, status__) \ 996#define CsrWifiNmeWpsConfigSetCfmCreate(msg__, dst__, src__, status__) \
997 msg__ = (CsrWifiNmeWpsConfigSetCfm *) CsrPmemAlloc(sizeof(CsrWifiNmeWpsConfigSetCfm)); \ 997 msg__ = kmalloc(sizeof(CsrWifiNmeWpsConfigSetCfm), GFP_KERNEL); \
998 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_WPS_CONFIG_SET_CFM, dst__, src__); \ 998 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_WPS_CONFIG_SET_CFM, dst__, src__); \
999 msg__->status = (status__); 999 msg__->status = (status__);
1000 1000
@@ -1030,7 +1030,7 @@ extern const char *CsrWifiNmeDownstreamPrimNames[CSR_WIFI_NME_PRIM_DOWNSTREAM_CO
1030 1030
1031*******************************************************************************/ 1031*******************************************************************************/
1032#define CsrWifiNmeWpsReqCreate(msg__, dst__, src__, interfaceTag__, pin__, ssid__, bssid__) \ 1032#define CsrWifiNmeWpsReqCreate(msg__, dst__, src__, interfaceTag__, pin__, ssid__, bssid__) \
1033 msg__ = (CsrWifiNmeWpsReq *) CsrPmemAlloc(sizeof(CsrWifiNmeWpsReq)); \ 1033 msg__ = kmalloc(sizeof(CsrWifiNmeWpsReq), GFP_KERNEL); \
1034 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_WPS_REQ, dst__, src__); \ 1034 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_NME_PRIM, CSR_WIFI_NME_WPS_REQ, dst__, src__); \
1035 msg__->interfaceTag = (interfaceTag__); \ 1035 msg__->interfaceTag = (interfaceTag__); \
1036 memcpy(msg__->pin, (pin__), sizeof(u8) * 8); \ 1036 memcpy(msg__->pin, (pin__), sizeof(u8) * 8); \
diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_lib.h b/drivers/staging/csr/csr_wifi_router_ctrl_lib.h
index fd214672f192..ba8e9836e435 100644
--- a/drivers/staging/csr/csr_wifi_router_ctrl_lib.h
+++ b/drivers/staging/csr/csr_wifi_router_ctrl_lib.h
@@ -101,7 +101,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
101 101
102*******************************************************************************/ 102*******************************************************************************/
103#define CsrWifiRouterCtrlBlockAckDisableReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, macAddress__, trafficStreamID__, role__) \ 103#define CsrWifiRouterCtrlBlockAckDisableReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, macAddress__, trafficStreamID__, role__) \
104 msg__ = (CsrWifiRouterCtrlBlockAckDisableReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlBlockAckDisableReq)); \ 104 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlBlockAckDisableReq), GFP_KERNEL); \
105 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_BLOCK_ACK_DISABLE_REQ, dst__, src__); \ 105 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_BLOCK_ACK_DISABLE_REQ, dst__, src__); \
106 msg__->interfaceTag = (interfaceTag__); \ 106 msg__->interfaceTag = (interfaceTag__); \
107 msg__->clientData = (clientData__); \ 107 msg__->clientData = (clientData__); \
@@ -134,7 +134,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
134 134
135*******************************************************************************/ 135*******************************************************************************/
136#define CsrWifiRouterCtrlBlockAckDisableCfmCreate(msg__, dst__, src__, clientData__, interfaceTag__, status__) \ 136#define CsrWifiRouterCtrlBlockAckDisableCfmCreate(msg__, dst__, src__, clientData__, interfaceTag__, status__) \
137 msg__ = (CsrWifiRouterCtrlBlockAckDisableCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlBlockAckDisableCfm)); \ 137 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlBlockAckDisableCfm), GFP_KERNEL); \
138 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_BLOCK_ACK_DISABLE_CFM, dst__, src__); \ 138 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_BLOCK_ACK_DISABLE_CFM, dst__, src__); \
139 msg__->clientData = (clientData__); \ 139 msg__->clientData = (clientData__); \
140 msg__->interfaceTag = (interfaceTag__); \ 140 msg__->interfaceTag = (interfaceTag__); \
@@ -170,7 +170,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
170 170
171*******************************************************************************/ 171*******************************************************************************/
172#define CsrWifiRouterCtrlBlockAckEnableReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, macAddress__, trafficStreamID__, role__, bufferSize__, timeout__, ssn__) \ 172#define CsrWifiRouterCtrlBlockAckEnableReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, macAddress__, trafficStreamID__, role__, bufferSize__, timeout__, ssn__) \
173 msg__ = (CsrWifiRouterCtrlBlockAckEnableReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlBlockAckEnableReq)); \ 173 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlBlockAckEnableReq), GFP_KERNEL); \
174 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_BLOCK_ACK_ENABLE_REQ, dst__, src__); \ 174 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_BLOCK_ACK_ENABLE_REQ, dst__, src__); \
175 msg__->interfaceTag = (interfaceTag__); \ 175 msg__->interfaceTag = (interfaceTag__); \
176 msg__->clientData = (clientData__); \ 176 msg__->clientData = (clientData__); \
@@ -206,7 +206,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
206 206
207*******************************************************************************/ 207*******************************************************************************/
208#define CsrWifiRouterCtrlBlockAckEnableCfmCreate(msg__, dst__, src__, clientData__, interfaceTag__, status__) \ 208#define CsrWifiRouterCtrlBlockAckEnableCfmCreate(msg__, dst__, src__, clientData__, interfaceTag__, status__) \
209 msg__ = (CsrWifiRouterCtrlBlockAckEnableCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlBlockAckEnableCfm)); \ 209 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlBlockAckEnableCfm), GFP_KERNEL); \
210 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_BLOCK_ACK_ENABLE_CFM, dst__, src__); \ 210 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_BLOCK_ACK_ENABLE_CFM, dst__, src__); \
211 msg__->clientData = (clientData__); \ 211 msg__->clientData = (clientData__); \
212 msg__->interfaceTag = (interfaceTag__); \ 212 msg__->interfaceTag = (interfaceTag__); \
@@ -239,7 +239,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
239 239
240*******************************************************************************/ 240*******************************************************************************/
241#define CsrWifiRouterCtrlBlockAckErrorIndCreate(msg__, dst__, src__, clientData__, interfaceTag__, trafficStreamID__, peerMacAddress__, status__) \ 241#define CsrWifiRouterCtrlBlockAckErrorIndCreate(msg__, dst__, src__, clientData__, interfaceTag__, trafficStreamID__, peerMacAddress__, status__) \
242 msg__ = (CsrWifiRouterCtrlBlockAckErrorInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlBlockAckErrorInd)); \ 242 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlBlockAckErrorInd), GFP_KERNEL); \
243 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_BLOCK_ACK_ERROR_IND, dst__, src__); \ 243 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_BLOCK_ACK_ERROR_IND, dst__, src__); \
244 msg__->clientData = (clientData__); \ 244 msg__->clientData = (clientData__); \
245 msg__->interfaceTag = (interfaceTag__); \ 245 msg__->interfaceTag = (interfaceTag__); \
@@ -270,7 +270,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
270 270
271*******************************************************************************/ 271*******************************************************************************/
272#define CsrWifiRouterCtrlCapabilitiesReqCreate(msg__, dst__, src__, clientData__) \ 272#define CsrWifiRouterCtrlCapabilitiesReqCreate(msg__, dst__, src__, clientData__) \
273 msg__ = (CsrWifiRouterCtrlCapabilitiesReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlCapabilitiesReq)); \ 273 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlCapabilitiesReq), GFP_KERNEL); \
274 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_CAPABILITIES_REQ, dst__, src__); \ 274 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_CAPABILITIES_REQ, dst__, src__); \
275 msg__->clientData = (clientData__); 275 msg__->clientData = (clientData__);
276 276
@@ -301,7 +301,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
301 301
302*******************************************************************************/ 302*******************************************************************************/
303#define CsrWifiRouterCtrlCapabilitiesCfmCreate(msg__, dst__, src__, clientData__, commandQueueSize__, trafficQueueSize__) \ 303#define CsrWifiRouterCtrlCapabilitiesCfmCreate(msg__, dst__, src__, clientData__, commandQueueSize__, trafficQueueSize__) \
304 msg__ = (CsrWifiRouterCtrlCapabilitiesCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlCapabilitiesCfm)); \ 304 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlCapabilitiesCfm), GFP_KERNEL); \
305 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_CAPABILITIES_CFM, dst__, src__); \ 305 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_CAPABILITIES_CFM, dst__, src__); \
306 msg__->clientData = (clientData__); \ 306 msg__->clientData = (clientData__); \
307 msg__->commandQueueSize = (commandQueueSize__); \ 307 msg__->commandQueueSize = (commandQueueSize__); \
@@ -332,7 +332,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
332 332
333*******************************************************************************/ 333*******************************************************************************/
334#define CsrWifiRouterCtrlConfigurePowerModeReqCreate(msg__, dst__, src__, clientData__, mode__, wakeHost__) \ 334#define CsrWifiRouterCtrlConfigurePowerModeReqCreate(msg__, dst__, src__, clientData__, mode__, wakeHost__) \
335 msg__ = (CsrWifiRouterCtrlConfigurePowerModeReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlConfigurePowerModeReq)); \ 335 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlConfigurePowerModeReq), GFP_KERNEL); \
336 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_CONFIGURE_POWER_MODE_REQ, dst__, src__); \ 336 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_CONFIGURE_POWER_MODE_REQ, dst__, src__); \
337 msg__->clientData = (clientData__); \ 337 msg__->clientData = (clientData__); \
338 msg__->mode = (mode__); \ 338 msg__->mode = (mode__); \
@@ -364,7 +364,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
364 364
365*******************************************************************************/ 365*******************************************************************************/
366#define CsrWifiRouterCtrlConnectedIndCreate(msg__, dst__, src__, clientData__, interfaceTag__, peerMacAddress__, peerStatus__) \ 366#define CsrWifiRouterCtrlConnectedIndCreate(msg__, dst__, src__, clientData__, interfaceTag__, peerMacAddress__, peerStatus__) \
367 msg__ = (CsrWifiRouterCtrlConnectedInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlConnectedInd)); \ 367 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlConnectedInd), GFP_KERNEL); \
368 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_CONNECTED_IND, dst__, src__); \ 368 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_CONNECTED_IND, dst__, src__); \
369 msg__->clientData = (clientData__); \ 369 msg__->clientData = (clientData__); \
370 msg__->interfaceTag = (interfaceTag__); \ 370 msg__->interfaceTag = (interfaceTag__); \
@@ -400,7 +400,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
400 400
401*******************************************************************************/ 401*******************************************************************************/
402#define CsrWifiRouterCtrlHipReqCreate(msg__, dst__, src__, mlmeCommandLength__, mlmeCommand__, dataRef1Length__, dataRef1__, dataRef2Length__, dataRef2__) \ 402#define CsrWifiRouterCtrlHipReqCreate(msg__, dst__, src__, mlmeCommandLength__, mlmeCommand__, dataRef1Length__, dataRef1__, dataRef2Length__, dataRef2__) \
403 msg__ = (CsrWifiRouterCtrlHipReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlHipReq)); \ 403 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlHipReq), GFP_KERNEL); \
404 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_HIP_REQ, dst__, src__); \ 404 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_HIP_REQ, dst__, src__); \
405 msg__->mlmeCommandLength = (mlmeCommandLength__); \ 405 msg__->mlmeCommandLength = (mlmeCommandLength__); \
406 msg__->mlmeCommand = (mlmeCommand__); \ 406 msg__->mlmeCommand = (mlmeCommand__); \
@@ -438,7 +438,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
438 438
439*******************************************************************************/ 439*******************************************************************************/
440#define CsrWifiRouterCtrlHipIndCreate(msg__, dst__, src__, mlmeCommandLength__, mlmeCommand__, dataRef1Length__, dataRef1__, dataRef2Length__, dataRef2__) \ 440#define CsrWifiRouterCtrlHipIndCreate(msg__, dst__, src__, mlmeCommandLength__, mlmeCommand__, dataRef1Length__, dataRef1__, dataRef2Length__, dataRef2__) \
441 msg__ = (CsrWifiRouterCtrlHipInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlHipInd)); \ 441 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlHipInd), GFP_KERNEL); \
442 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_HIP_IND, dst__, src__); \ 442 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_HIP_IND, dst__, src__); \
443 msg__->mlmeCommandLength = (mlmeCommandLength__); \ 443 msg__->mlmeCommandLength = (mlmeCommandLength__); \
444 msg__->mlmeCommand = (mlmeCommand__); \ 444 msg__->mlmeCommand = (mlmeCommand__); \
@@ -472,7 +472,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
472 472
473*******************************************************************************/ 473*******************************************************************************/
474#define CsrWifiRouterCtrlM4ReadyToSendIndCreate(msg__, dst__, src__, clientData__, interfaceTag__, peerMacAddress__) \ 474#define CsrWifiRouterCtrlM4ReadyToSendIndCreate(msg__, dst__, src__, clientData__, interfaceTag__, peerMacAddress__) \
475 msg__ = (CsrWifiRouterCtrlM4ReadyToSendInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlM4ReadyToSendInd)); \ 475 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlM4ReadyToSendInd), GFP_KERNEL); \
476 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_M4_READY_TO_SEND_IND, dst__, src__); \ 476 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_M4_READY_TO_SEND_IND, dst__, src__); \
477 msg__->clientData = (clientData__); \ 477 msg__->clientData = (clientData__); \
478 msg__->interfaceTag = (interfaceTag__); \ 478 msg__->interfaceTag = (interfaceTag__); \
@@ -502,7 +502,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
502 502
503*******************************************************************************/ 503*******************************************************************************/
504#define CsrWifiRouterCtrlM4TransmitReqCreate(msg__, dst__, src__, interfaceTag__, clientData__) \ 504#define CsrWifiRouterCtrlM4TransmitReqCreate(msg__, dst__, src__, interfaceTag__, clientData__) \
505 msg__ = (CsrWifiRouterCtrlM4TransmitReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlM4TransmitReq)); \ 505 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlM4TransmitReq), GFP_KERNEL); \
506 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_M4_TRANSMIT_REQ, dst__, src__); \ 506 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_M4_TRANSMIT_REQ, dst__, src__); \
507 msg__->interfaceTag = (interfaceTag__); \ 507 msg__->interfaceTag = (interfaceTag__); \
508 msg__->clientData = (clientData__); 508 msg__->clientData = (clientData__);
@@ -533,7 +533,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
533 533
534*******************************************************************************/ 534*******************************************************************************/
535#define CsrWifiRouterCtrlM4TransmittedIndCreate(msg__, dst__, src__, clientData__, interfaceTag__, peerMacAddress__, status__) \ 535#define CsrWifiRouterCtrlM4TransmittedIndCreate(msg__, dst__, src__, clientData__, interfaceTag__, peerMacAddress__, status__) \
536 msg__ = (CsrWifiRouterCtrlM4TransmittedInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlM4TransmittedInd)); \ 536 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlM4TransmittedInd), GFP_KERNEL); \
537 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_M4_TRANSMITTED_IND, dst__, src__); \ 537 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_M4_TRANSMITTED_IND, dst__, src__); \
538 msg__->clientData = (clientData__); \ 538 msg__->clientData = (clientData__); \
539 msg__->interfaceTag = (interfaceTag__); \ 539 msg__->interfaceTag = (interfaceTag__); \
@@ -565,7 +565,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
565 565
566*******************************************************************************/ 566*******************************************************************************/
567#define CsrWifiRouterCtrlMediaStatusReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, mediaStatus__) \ 567#define CsrWifiRouterCtrlMediaStatusReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, mediaStatus__) \
568 msg__ = (CsrWifiRouterCtrlMediaStatusReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlMediaStatusReq)); \ 568 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlMediaStatusReq), GFP_KERNEL); \
569 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_MEDIA_STATUS_REQ, dst__, src__); \ 569 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_MEDIA_STATUS_REQ, dst__, src__); \
570 msg__->interfaceTag = (interfaceTag__); \ 570 msg__->interfaceTag = (interfaceTag__); \
571 msg__->clientData = (clientData__); \ 571 msg__->clientData = (clientData__); \
@@ -597,7 +597,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
597 597
598*******************************************************************************/ 598*******************************************************************************/
599#define CsrWifiRouterCtrlMicFailureIndCreate(msg__, dst__, src__, clientData__, interfaceTag__, peerMacAddress__, unicastPdu__) \ 599#define CsrWifiRouterCtrlMicFailureIndCreate(msg__, dst__, src__, clientData__, interfaceTag__, peerMacAddress__, unicastPdu__) \
600 msg__ = (CsrWifiRouterCtrlMicFailureInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlMicFailureInd)); \ 600 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlMicFailureInd), GFP_KERNEL); \
601 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_MIC_FAILURE_IND, dst__, src__); \ 601 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_MIC_FAILURE_IND, dst__, src__); \
602 msg__->clientData = (clientData__); \ 602 msg__->clientData = (clientData__); \
603 msg__->interfaceTag = (interfaceTag__); \ 603 msg__->interfaceTag = (interfaceTag__); \
@@ -638,7 +638,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
638 638
639*******************************************************************************/ 639*******************************************************************************/
640#define CsrWifiRouterCtrlModeSetReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, mode__, bssid__, protection__, intraBssDistEnabled__) \ 640#define CsrWifiRouterCtrlModeSetReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, mode__, bssid__, protection__, intraBssDistEnabled__) \
641 msg__ = (CsrWifiRouterCtrlModeSetReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlModeSetReq)); \ 641 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlModeSetReq), GFP_KERNEL); \
642 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_MODE_SET_REQ, dst__, src__); \ 642 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_MODE_SET_REQ, dst__, src__); \
643 msg__->interfaceTag = (interfaceTag__); \ 643 msg__->interfaceTag = (interfaceTag__); \
644 msg__->clientData = (clientData__); \ 644 msg__->clientData = (clientData__); \
@@ -673,7 +673,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
673 673
674*******************************************************************************/ 674*******************************************************************************/
675#define CsrWifiRouterCtrlModeSetCfmCreate(msg__, dst__, src__, clientData__, interfaceTag__, mode__, status__) \ 675#define CsrWifiRouterCtrlModeSetCfmCreate(msg__, dst__, src__, clientData__, interfaceTag__, mode__, status__) \
676 msg__ = (CsrWifiRouterCtrlModeSetCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlModeSetCfm)); \ 676 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlModeSetCfm), GFP_KERNEL); \
677 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_MODE_SET_CFM, dst__, src__); \ 677 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_MODE_SET_CFM, dst__, src__); \
678 msg__->clientData = (clientData__); \ 678 msg__->clientData = (clientData__); \
679 msg__->interfaceTag = (interfaceTag__); \ 679 msg__->interfaceTag = (interfaceTag__); \
@@ -707,7 +707,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
707 707
708*******************************************************************************/ 708*******************************************************************************/
709#define CsrWifiRouterCtrlMulticastAddressIndCreate(msg__, dst__, src__, clientData__, interfaceTag__, action__, setAddressesCount__, setAddresses__) \ 709#define CsrWifiRouterCtrlMulticastAddressIndCreate(msg__, dst__, src__, clientData__, interfaceTag__, action__, setAddressesCount__, setAddresses__) \
710 msg__ = (CsrWifiRouterCtrlMulticastAddressInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlMulticastAddressInd)); \ 710 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlMulticastAddressInd), GFP_KERNEL); \
711 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_MULTICAST_ADDRESS_IND, dst__, src__); \ 711 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_MULTICAST_ADDRESS_IND, dst__, src__); \
712 msg__->clientData = (clientData__); \ 712 msg__->clientData = (clientData__); \
713 msg__->interfaceTag = (interfaceTag__); \ 713 msg__->interfaceTag = (interfaceTag__); \
@@ -742,7 +742,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
742 742
743*******************************************************************************/ 743*******************************************************************************/
744#define CsrWifiRouterCtrlMulticastAddressResCreate(msg__, dst__, src__, interfaceTag__, clientData__, status__, action__, getAddressesCount__, getAddresses__) \ 744#define CsrWifiRouterCtrlMulticastAddressResCreate(msg__, dst__, src__, interfaceTag__, clientData__, status__, action__, getAddressesCount__, getAddresses__) \
745 msg__ = (CsrWifiRouterCtrlMulticastAddressRes *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlMulticastAddressRes)); \ 745 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlMulticastAddressRes), GFP_KERNEL); \
746 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_MULTICAST_ADDRESS_RES, dst__, src__); \ 746 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_MULTICAST_ADDRESS_RES, dst__, src__); \
747 msg__->interfaceTag = (interfaceTag__); \ 747 msg__->interfaceTag = (interfaceTag__); \
748 msg__->clientData = (clientData__); \ 748 msg__->clientData = (clientData__); \
@@ -778,7 +778,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
778 778
779*******************************************************************************/ 779*******************************************************************************/
780#define CsrWifiRouterCtrlPeerAddReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, peerMacAddress__, associationId__, staInfo__) \ 780#define CsrWifiRouterCtrlPeerAddReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, peerMacAddress__, associationId__, staInfo__) \
781 msg__ = (CsrWifiRouterCtrlPeerAddReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlPeerAddReq)); \ 781 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlPeerAddReq), GFP_KERNEL); \
782 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_PEER_ADD_REQ, dst__, src__); \ 782 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_PEER_ADD_REQ, dst__, src__); \
783 msg__->interfaceTag = (interfaceTag__); \ 783 msg__->interfaceTag = (interfaceTag__); \
784 msg__->clientData = (clientData__); \ 784 msg__->clientData = (clientData__); \
@@ -813,7 +813,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
813 813
814*******************************************************************************/ 814*******************************************************************************/
815#define CsrWifiRouterCtrlPeerAddCfmCreate(msg__, dst__, src__, clientData__, interfaceTag__, peerMacAddress__, peerRecordHandle__, status__) \ 815#define CsrWifiRouterCtrlPeerAddCfmCreate(msg__, dst__, src__, clientData__, interfaceTag__, peerMacAddress__, peerRecordHandle__, status__) \
816 msg__ = (CsrWifiRouterCtrlPeerAddCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlPeerAddCfm)); \ 816 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlPeerAddCfm), GFP_KERNEL); \
817 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_PEER_ADD_CFM, dst__, src__); \ 817 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_PEER_ADD_CFM, dst__, src__); \
818 msg__->clientData = (clientData__); \ 818 msg__->clientData = (clientData__); \
819 msg__->interfaceTag = (interfaceTag__); \ 819 msg__->interfaceTag = (interfaceTag__); \
@@ -846,7 +846,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
846 846
847*******************************************************************************/ 847*******************************************************************************/
848#define CsrWifiRouterCtrlPeerDelReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, peerRecordHandle__) \ 848#define CsrWifiRouterCtrlPeerDelReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, peerRecordHandle__) \
849 msg__ = (CsrWifiRouterCtrlPeerDelReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlPeerDelReq)); \ 849 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlPeerDelReq), GFP_KERNEL); \
850 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_PEER_DEL_REQ, dst__, src__); \ 850 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_PEER_DEL_REQ, dst__, src__); \
851 msg__->interfaceTag = (interfaceTag__); \ 851 msg__->interfaceTag = (interfaceTag__); \
852 msg__->clientData = (clientData__); \ 852 msg__->clientData = (clientData__); \
@@ -877,7 +877,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
877 877
878*******************************************************************************/ 878*******************************************************************************/
879#define CsrWifiRouterCtrlPeerDelCfmCreate(msg__, dst__, src__, clientData__, interfaceTag__, status__) \ 879#define CsrWifiRouterCtrlPeerDelCfmCreate(msg__, dst__, src__, clientData__, interfaceTag__, status__) \
880 msg__ = (CsrWifiRouterCtrlPeerDelCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlPeerDelCfm)); \ 880 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlPeerDelCfm), GFP_KERNEL); \
881 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_PEER_DEL_CFM, dst__, src__); \ 881 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_PEER_DEL_CFM, dst__, src__); \
882 msg__->clientData = (clientData__); \ 882 msg__->clientData = (clientData__); \
883 msg__->interfaceTag = (interfaceTag__); \ 883 msg__->interfaceTag = (interfaceTag__); \
@@ -909,7 +909,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
909 909
910*******************************************************************************/ 910*******************************************************************************/
911#define CsrWifiRouterCtrlPeerUpdateReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, peerRecordHandle__, powersaveMode__) \ 911#define CsrWifiRouterCtrlPeerUpdateReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, peerRecordHandle__, powersaveMode__) \
912 msg__ = (CsrWifiRouterCtrlPeerUpdateReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlPeerUpdateReq)); \ 912 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlPeerUpdateReq), GFP_KERNEL); \
913 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_PEER_UPDATE_REQ, dst__, src__); \ 913 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_PEER_UPDATE_REQ, dst__, src__); \
914 msg__->interfaceTag = (interfaceTag__); \ 914 msg__->interfaceTag = (interfaceTag__); \
915 msg__->clientData = (clientData__); \ 915 msg__->clientData = (clientData__); \
@@ -941,7 +941,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
941 941
942*******************************************************************************/ 942*******************************************************************************/
943#define CsrWifiRouterCtrlPeerUpdateCfmCreate(msg__, dst__, src__, clientData__, interfaceTag__, status__) \ 943#define CsrWifiRouterCtrlPeerUpdateCfmCreate(msg__, dst__, src__, clientData__, interfaceTag__, status__) \
944 msg__ = (CsrWifiRouterCtrlPeerUpdateCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlPeerUpdateCfm)); \ 944 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlPeerUpdateCfm), GFP_KERNEL); \
945 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_PEER_UPDATE_CFM, dst__, src__); \ 945 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_PEER_UPDATE_CFM, dst__, src__); \
946 msg__->clientData = (clientData__); \ 946 msg__->clientData = (clientData__); \
947 msg__->interfaceTag = (interfaceTag__); \ 947 msg__->interfaceTag = (interfaceTag__); \
@@ -975,7 +975,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
975 975
976*******************************************************************************/ 976*******************************************************************************/
977#define CsrWifiRouterCtrlPortConfigureReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, uncontrolledPortAction__, controlledPortAction__, macAddress__, setProtection__) \ 977#define CsrWifiRouterCtrlPortConfigureReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, uncontrolledPortAction__, controlledPortAction__, macAddress__, setProtection__) \
978 msg__ = (CsrWifiRouterCtrlPortConfigureReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlPortConfigureReq)); \ 978 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlPortConfigureReq), GFP_KERNEL); \
979 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_PORT_CONFIGURE_REQ, dst__, src__); \ 979 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_PORT_CONFIGURE_REQ, dst__, src__); \
980 msg__->interfaceTag = (interfaceTag__); \ 980 msg__->interfaceTag = (interfaceTag__); \
981 msg__->clientData = (clientData__); \ 981 msg__->clientData = (clientData__); \
@@ -1010,7 +1010,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
1010 1010
1011*******************************************************************************/ 1011*******************************************************************************/
1012#define CsrWifiRouterCtrlPortConfigureCfmCreate(msg__, dst__, src__, clientData__, interfaceTag__, status__, macAddress__) \ 1012#define CsrWifiRouterCtrlPortConfigureCfmCreate(msg__, dst__, src__, clientData__, interfaceTag__, status__, macAddress__) \
1013 msg__ = (CsrWifiRouterCtrlPortConfigureCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlPortConfigureCfm)); \ 1013 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlPortConfigureCfm), GFP_KERNEL); \
1014 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_PORT_CONFIGURE_CFM, dst__, src__); \ 1014 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_PORT_CONFIGURE_CFM, dst__, src__); \
1015 msg__->clientData = (clientData__); \ 1015 msg__->clientData = (clientData__); \
1016 msg__->interfaceTag = (interfaceTag__); \ 1016 msg__->interfaceTag = (interfaceTag__); \
@@ -1043,7 +1043,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
1043 1043
1044*******************************************************************************/ 1044*******************************************************************************/
1045#define CsrWifiRouterCtrlQosControlReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, control__, queueConfig__) \ 1045#define CsrWifiRouterCtrlQosControlReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, control__, queueConfig__) \
1046 msg__ = (CsrWifiRouterCtrlQosControlReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlQosControlReq)); \ 1046 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlQosControlReq), GFP_KERNEL); \
1047 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_QOS_CONTROL_REQ, dst__, src__); \ 1047 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_QOS_CONTROL_REQ, dst__, src__); \
1048 msg__->interfaceTag = (interfaceTag__); \ 1048 msg__->interfaceTag = (interfaceTag__); \
1049 msg__->clientData = (clientData__); \ 1049 msg__->clientData = (clientData__); \
@@ -1073,7 +1073,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
1073 1073
1074*******************************************************************************/ 1074*******************************************************************************/
1075#define CsrWifiRouterCtrlRawSdioDeinitialiseReqCreate(msg__, dst__, src__, clientData__) \ 1075#define CsrWifiRouterCtrlRawSdioDeinitialiseReqCreate(msg__, dst__, src__, clientData__) \
1076 msg__ = (CsrWifiRouterCtrlRawSdioDeinitialiseReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlRawSdioDeinitialiseReq)); \ 1076 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlRawSdioDeinitialiseReq), GFP_KERNEL); \
1077 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_RAW_SDIO_DEINITIALISE_REQ, dst__, src__); \ 1077 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_RAW_SDIO_DEINITIALISE_REQ, dst__, src__); \
1078 msg__->clientData = (clientData__); 1078 msg__->clientData = (clientData__);
1079 1079
@@ -1101,7 +1101,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
1101 1101
1102*******************************************************************************/ 1102*******************************************************************************/
1103#define CsrWifiRouterCtrlRawSdioDeinitialiseCfmCreate(msg__, dst__, src__, clientData__, result__) \ 1103#define CsrWifiRouterCtrlRawSdioDeinitialiseCfmCreate(msg__, dst__, src__, clientData__, result__) \
1104 msg__ = (CsrWifiRouterCtrlRawSdioDeinitialiseCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlRawSdioDeinitialiseCfm)); \ 1104 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlRawSdioDeinitialiseCfm), GFP_KERNEL); \
1105 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_RAW_SDIO_DEINITIALISE_CFM, dst__, src__); \ 1105 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_RAW_SDIO_DEINITIALISE_CFM, dst__, src__); \
1106 msg__->clientData = (clientData__); \ 1106 msg__->clientData = (clientData__); \
1107 msg__->result = (result__); 1107 msg__->result = (result__);
@@ -1129,7 +1129,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
1129 1129
1130*******************************************************************************/ 1130*******************************************************************************/
1131#define CsrWifiRouterCtrlRawSdioInitialiseReqCreate(msg__, dst__, src__, clientData__) \ 1131#define CsrWifiRouterCtrlRawSdioInitialiseReqCreate(msg__, dst__, src__, clientData__) \
1132 msg__ = (CsrWifiRouterCtrlRawSdioInitialiseReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlRawSdioInitialiseReq)); \ 1132 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlRawSdioInitialiseReq), GFP_KERNEL); \
1133 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_RAW_SDIO_INITIALISE_REQ, dst__, src__); \ 1133 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_RAW_SDIO_INITIALISE_REQ, dst__, src__); \
1134 msg__->clientData = (clientData__); 1134 msg__->clientData = (clientData__);
1135 1135
@@ -1165,7 +1165,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
1165 1165
1166*******************************************************************************/ 1166*******************************************************************************/
1167#define CsrWifiRouterCtrlRawSdioInitialiseCfmCreate(msg__, dst__, src__, clientData__, result__, byteRead__, byteWrite__, firmwareDownload__, reset__, coreDumpPrepare__, byteBlockRead__, gpRead16__, gpWrite16__) \ 1167#define CsrWifiRouterCtrlRawSdioInitialiseCfmCreate(msg__, dst__, src__, clientData__, result__, byteRead__, byteWrite__, firmwareDownload__, reset__, coreDumpPrepare__, byteBlockRead__, gpRead16__, gpWrite16__) \
1168 msg__ = (CsrWifiRouterCtrlRawSdioInitialiseCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlRawSdioInitialiseCfm)); \ 1168 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlRawSdioInitialiseCfm), GFP_KERNEL); \
1169 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_RAW_SDIO_INITIALISE_CFM, dst__, src__); \ 1169 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_RAW_SDIO_INITIALISE_CFM, dst__, src__); \
1170 msg__->clientData = (clientData__); \ 1170 msg__->clientData = (clientData__); \
1171 msg__->result = (result__); \ 1171 msg__->result = (result__); \
@@ -1202,7 +1202,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
1202 1202
1203*******************************************************************************/ 1203*******************************************************************************/
1204#define CsrWifiRouterCtrlResumeIndCreate(msg__, dst__, src__, clientData__, powerMaintained__) \ 1204#define CsrWifiRouterCtrlResumeIndCreate(msg__, dst__, src__, clientData__, powerMaintained__) \
1205 msg__ = (CsrWifiRouterCtrlResumeInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlResumeInd)); \ 1205 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlResumeInd), GFP_KERNEL); \
1206 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_RESUME_IND, dst__, src__); \ 1206 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_RESUME_IND, dst__, src__); \
1207 msg__->clientData = (clientData__); \ 1207 msg__->clientData = (clientData__); \
1208 msg__->powerMaintained = (powerMaintained__); 1208 msg__->powerMaintained = (powerMaintained__);
@@ -1230,7 +1230,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
1230 1230
1231*******************************************************************************/ 1231*******************************************************************************/
1232#define CsrWifiRouterCtrlResumeResCreate(msg__, dst__, src__, clientData__, status__) \ 1232#define CsrWifiRouterCtrlResumeResCreate(msg__, dst__, src__, clientData__, status__) \
1233 msg__ = (CsrWifiRouterCtrlResumeRes *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlResumeRes)); \ 1233 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlResumeRes), GFP_KERNEL); \
1234 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_RESUME_RES, dst__, src__); \ 1234 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_RESUME_RES, dst__, src__); \
1235 msg__->clientData = (clientData__); \ 1235 msg__->clientData = (clientData__); \
1236 msg__->status = (status__); 1236 msg__->status = (status__);
@@ -1260,7 +1260,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
1260 1260
1261*******************************************************************************/ 1261*******************************************************************************/
1262#define CsrWifiRouterCtrlStaInactiveIndCreate(msg__, dst__, src__, clientData__, interfaceTag__, staAddress__) \ 1262#define CsrWifiRouterCtrlStaInactiveIndCreate(msg__, dst__, src__, clientData__, interfaceTag__, staAddress__) \
1263 msg__ = (CsrWifiRouterCtrlStaInactiveInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlStaInactiveInd)); \ 1263 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlStaInactiveInd), GFP_KERNEL); \
1264 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_STA_INACTIVE_IND, dst__, src__); \ 1264 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_STA_INACTIVE_IND, dst__, src__); \
1265 msg__->clientData = (clientData__); \ 1265 msg__->clientData = (clientData__); \
1266 msg__->interfaceTag = (interfaceTag__); \ 1266 msg__->interfaceTag = (interfaceTag__); \
@@ -1291,7 +1291,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
1291 1291
1292*******************************************************************************/ 1292*******************************************************************************/
1293#define CsrWifiRouterCtrlSuspendIndCreate(msg__, dst__, src__, clientData__, hardSuspend__, d3Suspend__) \ 1293#define CsrWifiRouterCtrlSuspendIndCreate(msg__, dst__, src__, clientData__, hardSuspend__, d3Suspend__) \
1294 msg__ = (CsrWifiRouterCtrlSuspendInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlSuspendInd)); \ 1294 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlSuspendInd), GFP_KERNEL); \
1295 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_SUSPEND_IND, dst__, src__); \ 1295 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_SUSPEND_IND, dst__, src__); \
1296 msg__->clientData = (clientData__); \ 1296 msg__->clientData = (clientData__); \
1297 msg__->hardSuspend = (hardSuspend__); \ 1297 msg__->hardSuspend = (hardSuspend__); \
@@ -1320,7 +1320,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
1320 1320
1321*******************************************************************************/ 1321*******************************************************************************/
1322#define CsrWifiRouterCtrlSuspendResCreate(msg__, dst__, src__, clientData__, status__) \ 1322#define CsrWifiRouterCtrlSuspendResCreate(msg__, dst__, src__, clientData__, status__) \
1323 msg__ = (CsrWifiRouterCtrlSuspendRes *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlSuspendRes)); \ 1323 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlSuspendRes), GFP_KERNEL); \
1324 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_SUSPEND_RES, dst__, src__); \ 1324 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_SUSPEND_RES, dst__, src__); \
1325 msg__->clientData = (clientData__); \ 1325 msg__->clientData = (clientData__); \
1326 msg__->status = (status__); 1326 msg__->status = (status__);
@@ -1351,7 +1351,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
1351 1351
1352*******************************************************************************/ 1352*******************************************************************************/
1353#define CsrWifiRouterCtrlTclasAddReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, tclasLength__, tclas__) \ 1353#define CsrWifiRouterCtrlTclasAddReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, tclasLength__, tclas__) \
1354 msg__ = (CsrWifiRouterCtrlTclasAddReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlTclasAddReq)); \ 1354 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlTclasAddReq), GFP_KERNEL); \
1355 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_TCLAS_ADD_REQ, dst__, src__); \ 1355 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_TCLAS_ADD_REQ, dst__, src__); \
1356 msg__->interfaceTag = (interfaceTag__); \ 1356 msg__->interfaceTag = (interfaceTag__); \
1357 msg__->clientData = (clientData__); \ 1357 msg__->clientData = (clientData__); \
@@ -1383,7 +1383,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
1383 1383
1384*******************************************************************************/ 1384*******************************************************************************/
1385#define CsrWifiRouterCtrlTclasAddCfmCreate(msg__, dst__, src__, clientData__, interfaceTag__, status__) \ 1385#define CsrWifiRouterCtrlTclasAddCfmCreate(msg__, dst__, src__, clientData__, interfaceTag__, status__) \
1386 msg__ = (CsrWifiRouterCtrlTclasAddCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlTclasAddCfm)); \ 1386 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlTclasAddCfm), GFP_KERNEL); \
1387 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_TCLAS_ADD_CFM, dst__, src__); \ 1387 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_TCLAS_ADD_CFM, dst__, src__); \
1388 msg__->clientData = (clientData__); \ 1388 msg__->clientData = (clientData__); \
1389 msg__->interfaceTag = (interfaceTag__); \ 1389 msg__->interfaceTag = (interfaceTag__); \
@@ -1415,7 +1415,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
1415 1415
1416*******************************************************************************/ 1416*******************************************************************************/
1417#define CsrWifiRouterCtrlTclasDelReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, tclasLength__, tclas__) \ 1417#define CsrWifiRouterCtrlTclasDelReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, tclasLength__, tclas__) \
1418 msg__ = (CsrWifiRouterCtrlTclasDelReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlTclasDelReq)); \ 1418 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlTclasDelReq), GFP_KERNEL); \
1419 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_TCLAS_DEL_REQ, dst__, src__); \ 1419 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_TCLAS_DEL_REQ, dst__, src__); \
1420 msg__->interfaceTag = (interfaceTag__); \ 1420 msg__->interfaceTag = (interfaceTag__); \
1421 msg__->clientData = (clientData__); \ 1421 msg__->clientData = (clientData__); \
@@ -1447,7 +1447,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
1447 1447
1448*******************************************************************************/ 1448*******************************************************************************/
1449#define CsrWifiRouterCtrlTclasDelCfmCreate(msg__, dst__, src__, clientData__, interfaceTag__, status__) \ 1449#define CsrWifiRouterCtrlTclasDelCfmCreate(msg__, dst__, src__, clientData__, interfaceTag__, status__) \
1450 msg__ = (CsrWifiRouterCtrlTclasDelCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlTclasDelCfm)); \ 1450 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlTclasDelCfm), GFP_KERNEL); \
1451 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_TCLAS_DEL_CFM, dst__, src__); \ 1451 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_TCLAS_DEL_CFM, dst__, src__); \
1452 msg__->clientData = (clientData__); \ 1452 msg__->clientData = (clientData__); \
1453 msg__->interfaceTag = (interfaceTag__); \ 1453 msg__->interfaceTag = (interfaceTag__); \
@@ -1479,7 +1479,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
1479 1479
1480*******************************************************************************/ 1480*******************************************************************************/
1481#define CsrWifiRouterCtrlTrafficClassificationReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, trafficType__, period__) \ 1481#define CsrWifiRouterCtrlTrafficClassificationReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, trafficType__, period__) \
1482 msg__ = (CsrWifiRouterCtrlTrafficClassificationReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlTrafficClassificationReq)); \ 1482 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlTrafficClassificationReq), GFP_KERNEL); \
1483 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_TRAFFIC_CLASSIFICATION_REQ, dst__, src__); \ 1483 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_TRAFFIC_CLASSIFICATION_REQ, dst__, src__); \
1484 msg__->interfaceTag = (interfaceTag__); \ 1484 msg__->interfaceTag = (interfaceTag__); \
1485 msg__->clientData = (clientData__); \ 1485 msg__->clientData = (clientData__); \
@@ -1512,7 +1512,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
1512 1512
1513*******************************************************************************/ 1513*******************************************************************************/
1514#define CsrWifiRouterCtrlTrafficConfigReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, trafficConfigType__, config__) \ 1514#define CsrWifiRouterCtrlTrafficConfigReqCreate(msg__, dst__, src__, interfaceTag__, clientData__, trafficConfigType__, config__) \
1515 msg__ = (CsrWifiRouterCtrlTrafficConfigReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlTrafficConfigReq)); \ 1515 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlTrafficConfigReq), GFP_KERNEL); \
1516 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_TRAFFIC_CONFIG_REQ, dst__, src__); \ 1516 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_TRAFFIC_CONFIG_REQ, dst__, src__); \
1517 msg__->interfaceTag = (interfaceTag__); \ 1517 msg__->interfaceTag = (interfaceTag__); \
1518 msg__->clientData = (clientData__); \ 1518 msg__->clientData = (clientData__); \
@@ -1546,7 +1546,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
1546 1546
1547*******************************************************************************/ 1547*******************************************************************************/
1548#define CsrWifiRouterCtrlTrafficProtocolIndCreate(msg__, dst__, src__, clientData__, interfaceTag__, packetType__, direction__, srcAddress__) \ 1548#define CsrWifiRouterCtrlTrafficProtocolIndCreate(msg__, dst__, src__, clientData__, interfaceTag__, packetType__, direction__, srcAddress__) \
1549 msg__ = (CsrWifiRouterCtrlTrafficProtocolInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlTrafficProtocolInd)); \ 1549 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlTrafficProtocolInd), GFP_KERNEL); \
1550 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_TRAFFIC_PROTOCOL_IND, dst__, src__); \ 1550 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_TRAFFIC_PROTOCOL_IND, dst__, src__); \
1551 msg__->clientData = (clientData__); \ 1551 msg__->clientData = (clientData__); \
1552 msg__->interfaceTag = (interfaceTag__); \ 1552 msg__->interfaceTag = (interfaceTag__); \
@@ -1579,7 +1579,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
1579 1579
1580*******************************************************************************/ 1580*******************************************************************************/
1581#define CsrWifiRouterCtrlTrafficSampleIndCreate(msg__, dst__, src__, clientData__, interfaceTag__, stats__) \ 1581#define CsrWifiRouterCtrlTrafficSampleIndCreate(msg__, dst__, src__, clientData__, interfaceTag__, stats__) \
1582 msg__ = (CsrWifiRouterCtrlTrafficSampleInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlTrafficSampleInd)); \ 1582 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlTrafficSampleInd), GFP_KERNEL); \
1583 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_TRAFFIC_SAMPLE_IND, dst__, src__); \ 1583 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_TRAFFIC_SAMPLE_IND, dst__, src__); \
1584 msg__->clientData = (clientData__); \ 1584 msg__->clientData = (clientData__); \
1585 msg__->interfaceTag = (interfaceTag__); \ 1585 msg__->interfaceTag = (interfaceTag__); \
@@ -1610,7 +1610,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
1610 1610
1611*******************************************************************************/ 1611*******************************************************************************/
1612#define CsrWifiRouterCtrlUnexpectedFrameIndCreate(msg__, dst__, src__, clientData__, interfaceTag__, peerMacAddress__) \ 1612#define CsrWifiRouterCtrlUnexpectedFrameIndCreate(msg__, dst__, src__, clientData__, interfaceTag__, peerMacAddress__) \
1613 msg__ = (CsrWifiRouterCtrlUnexpectedFrameInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlUnexpectedFrameInd)); \ 1613 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlUnexpectedFrameInd), GFP_KERNEL); \
1614 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_UNEXPECTED_FRAME_IND, dst__, src__); \ 1614 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_UNEXPECTED_FRAME_IND, dst__, src__); \
1615 msg__->clientData = (clientData__); \ 1615 msg__->clientData = (clientData__); \
1616 msg__->interfaceTag = (interfaceTag__); \ 1616 msg__->interfaceTag = (interfaceTag__); \
@@ -1640,7 +1640,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
1640 1640
1641*******************************************************************************/ 1641*******************************************************************************/
1642#define CsrWifiRouterCtrlWapiFilterReqCreate(msg__, dst__, src__, interfaceTag__, isWapiConnected__) \ 1642#define CsrWifiRouterCtrlWapiFilterReqCreate(msg__, dst__, src__, interfaceTag__, isWapiConnected__) \
1643 msg__ = (CsrWifiRouterCtrlWapiFilterReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWapiFilterReq)); \ 1643 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlWapiFilterReq), GFP_KERNEL); \
1644 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WAPI_FILTER_REQ, dst__, src__); \ 1644 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WAPI_FILTER_REQ, dst__, src__); \
1645 msg__->interfaceTag = (interfaceTag__); \ 1645 msg__->interfaceTag = (interfaceTag__); \
1646 msg__->isWapiConnected = (isWapiConnected__); 1646 msg__->isWapiConnected = (isWapiConnected__);
@@ -1669,7 +1669,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
1669 1669
1670*******************************************************************************/ 1670*******************************************************************************/
1671#define CsrWifiRouterCtrlWapiMulticastFilterReqCreate(msg__, dst__, src__, interfaceTag__, status__) \ 1671#define CsrWifiRouterCtrlWapiMulticastFilterReqCreate(msg__, dst__, src__, interfaceTag__, status__) \
1672 msg__ = (CsrWifiRouterCtrlWapiMulticastFilterReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWapiMulticastFilterReq)); \ 1672 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlWapiMulticastFilterReq), GFP_KERNEL); \
1673 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WAPI_MULTICAST_FILTER_REQ, dst__, src__); \ 1673 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WAPI_MULTICAST_FILTER_REQ, dst__, src__); \
1674 msg__->interfaceTag = (interfaceTag__); \ 1674 msg__->interfaceTag = (interfaceTag__); \
1675 msg__->status = (status__); 1675 msg__->status = (status__);
@@ -1702,7 +1702,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
1702 1702
1703*******************************************************************************/ 1703*******************************************************************************/
1704#define CsrWifiRouterCtrlWapiRxMicCheckIndCreate(msg__, dst__, src__, clientData__, interfaceTag__, signalLength__, signal__, dataLength__, data__) \ 1704#define CsrWifiRouterCtrlWapiRxMicCheckIndCreate(msg__, dst__, src__, clientData__, interfaceTag__, signalLength__, signal__, dataLength__, data__) \
1705 msg__ = (CsrWifiRouterCtrlWapiRxMicCheckInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWapiRxMicCheckInd)); \ 1705 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlWapiRxMicCheckInd), GFP_KERNEL); \
1706 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WAPI_RX_MIC_CHECK_IND, dst__, src__); \ 1706 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WAPI_RX_MIC_CHECK_IND, dst__, src__); \
1707 msg__->clientData = (clientData__); \ 1707 msg__->clientData = (clientData__); \
1708 msg__->interfaceTag = (interfaceTag__); \ 1708 msg__->interfaceTag = (interfaceTag__); \
@@ -1738,7 +1738,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
1738 1738
1739*******************************************************************************/ 1739*******************************************************************************/
1740#define CsrWifiRouterCtrlWapiRxPktReqCreate(msg__, dst__, src__, interfaceTag__, signalLength__, signal__, dataLength__, data__) \ 1740#define CsrWifiRouterCtrlWapiRxPktReqCreate(msg__, dst__, src__, interfaceTag__, signalLength__, signal__, dataLength__, data__) \
1741 msg__ = (CsrWifiRouterCtrlWapiRxPktReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWapiRxPktReq)); \ 1741 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlWapiRxPktReq), GFP_KERNEL); \
1742 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WAPI_RX_PKT_REQ, dst__, src__); \ 1742 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WAPI_RX_PKT_REQ, dst__, src__); \
1743 msg__->interfaceTag = (interfaceTag__); \ 1743 msg__->interfaceTag = (interfaceTag__); \
1744 msg__->signalLength = (signalLength__); \ 1744 msg__->signalLength = (signalLength__); \
@@ -1770,7 +1770,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
1770 1770
1771*******************************************************************************/ 1771*******************************************************************************/
1772#define CsrWifiRouterCtrlWapiUnicastFilterReqCreate(msg__, dst__, src__, interfaceTag__, status__) \ 1772#define CsrWifiRouterCtrlWapiUnicastFilterReqCreate(msg__, dst__, src__, interfaceTag__, status__) \
1773 msg__ = (CsrWifiRouterCtrlWapiUnicastFilterReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWapiUnicastFilterReq)); \ 1773 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlWapiUnicastFilterReq), GFP_KERNEL); \
1774 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WAPI_UNICAST_FILTER_REQ, dst__, src__); \ 1774 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WAPI_UNICAST_FILTER_REQ, dst__, src__); \
1775 msg__->interfaceTag = (interfaceTag__); \ 1775 msg__->interfaceTag = (interfaceTag__); \
1776 msg__->status = (status__); 1776 msg__->status = (status__);
@@ -1801,7 +1801,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
1801 1801
1802*******************************************************************************/ 1802*******************************************************************************/
1803#define CsrWifiRouterCtrlWapiUnicastTxEncryptIndCreate(msg__, dst__, src__, clientData__, interfaceTag__, dataLength__, data__) \ 1803#define CsrWifiRouterCtrlWapiUnicastTxEncryptIndCreate(msg__, dst__, src__, clientData__, interfaceTag__, dataLength__, data__) \
1804 msg__ = (CsrWifiRouterCtrlWapiUnicastTxEncryptInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWapiUnicastTxEncryptInd)); \ 1804 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlWapiUnicastTxEncryptInd), GFP_KERNEL); \
1805 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WAPI_UNICAST_TX_ENCRYPT_IND, dst__, src__); \ 1805 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WAPI_UNICAST_TX_ENCRYPT_IND, dst__, src__); \
1806 msg__->clientData = (clientData__); \ 1806 msg__->clientData = (clientData__); \
1807 msg__->interfaceTag = (interfaceTag__); \ 1807 msg__->interfaceTag = (interfaceTag__); \
@@ -1833,7 +1833,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
1833 1833
1834*******************************************************************************/ 1834*******************************************************************************/
1835#define CsrWifiRouterCtrlWapiUnicastTxPktReqCreate(msg__, dst__, src__, interfaceTag__, dataLength__, data__) \ 1835#define CsrWifiRouterCtrlWapiUnicastTxPktReqCreate(msg__, dst__, src__, interfaceTag__, dataLength__, data__) \
1836 msg__ = (CsrWifiRouterCtrlWapiUnicastTxPktReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWapiUnicastTxPktReq)); \ 1836 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlWapiUnicastTxPktReq), GFP_KERNEL); \
1837 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WAPI_UNICAST_TX_PKT_REQ, dst__, src__); \ 1837 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WAPI_UNICAST_TX_PKT_REQ, dst__, src__); \
1838 msg__->interfaceTag = (interfaceTag__); \ 1838 msg__->interfaceTag = (interfaceTag__); \
1839 msg__->dataLength = (dataLength__); \ 1839 msg__->dataLength = (dataLength__); \
@@ -1862,7 +1862,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
1862 1862
1863*******************************************************************************/ 1863*******************************************************************************/
1864#define CsrWifiRouterCtrlWifiOffReqCreate(msg__, dst__, src__, clientData__) \ 1864#define CsrWifiRouterCtrlWifiOffReqCreate(msg__, dst__, src__, clientData__) \
1865 msg__ = (CsrWifiRouterCtrlWifiOffReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWifiOffReq)); \ 1865 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlWifiOffReq), GFP_KERNEL); \
1866 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WIFI_OFF_REQ, dst__, src__); \ 1866 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WIFI_OFF_REQ, dst__, src__); \
1867 msg__->clientData = (clientData__); 1867 msg__->clientData = (clientData__);
1868 1868
@@ -1890,7 +1890,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
1890 1890
1891*******************************************************************************/ 1891*******************************************************************************/
1892#define CsrWifiRouterCtrlWifiOffIndCreate(msg__, dst__, src__, clientData__, controlIndication__) \ 1892#define CsrWifiRouterCtrlWifiOffIndCreate(msg__, dst__, src__, clientData__, controlIndication__) \
1893 msg__ = (CsrWifiRouterCtrlWifiOffInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWifiOffInd)); \ 1893 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlWifiOffInd), GFP_KERNEL); \
1894 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WIFI_OFF_IND, dst__, src__); \ 1894 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WIFI_OFF_IND, dst__, src__); \
1895 msg__->clientData = (clientData__); \ 1895 msg__->clientData = (clientData__); \
1896 msg__->controlIndication = (controlIndication__); 1896 msg__->controlIndication = (controlIndication__);
@@ -1917,7 +1917,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
1917 1917
1918*******************************************************************************/ 1918*******************************************************************************/
1919#define CsrWifiRouterCtrlWifiOffResCreate(msg__, dst__, src__, clientData__) \ 1919#define CsrWifiRouterCtrlWifiOffResCreate(msg__, dst__, src__, clientData__) \
1920 msg__ = (CsrWifiRouterCtrlWifiOffRes *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWifiOffRes)); \ 1920 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlWifiOffRes), GFP_KERNEL); \
1921 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WIFI_OFF_RES, dst__, src__); \ 1921 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WIFI_OFF_RES, dst__, src__); \
1922 msg__->clientData = (clientData__); 1922 msg__->clientData = (clientData__);
1923 1923
@@ -1944,7 +1944,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
1944 1944
1945*******************************************************************************/ 1945*******************************************************************************/
1946#define CsrWifiRouterCtrlWifiOffCfmCreate(msg__, dst__, src__, clientData__) \ 1946#define CsrWifiRouterCtrlWifiOffCfmCreate(msg__, dst__, src__, clientData__) \
1947 msg__ = (CsrWifiRouterCtrlWifiOffCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWifiOffCfm)); \ 1947 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlWifiOffCfm), GFP_KERNEL); \
1948 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WIFI_OFF_CFM, dst__, src__); \ 1948 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WIFI_OFF_CFM, dst__, src__); \
1949 msg__->clientData = (clientData__); 1949 msg__->clientData = (clientData__);
1950 1950
@@ -1973,7 +1973,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
1973 1973
1974*******************************************************************************/ 1974*******************************************************************************/
1975#define CsrWifiRouterCtrlWifiOnReqCreate(msg__, dst__, src__, clientData__, dataLength__, data__) \ 1975#define CsrWifiRouterCtrlWifiOnReqCreate(msg__, dst__, src__, clientData__, dataLength__, data__) \
1976 msg__ = (CsrWifiRouterCtrlWifiOnReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWifiOnReq)); \ 1976 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlWifiOnReq), GFP_KERNEL); \
1977 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WIFI_ON_REQ, dst__, src__); \ 1977 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WIFI_ON_REQ, dst__, src__); \
1978 msg__->clientData = (clientData__); \ 1978 msg__->clientData = (clientData__); \
1979 msg__->dataLength = (dataLength__); \ 1979 msg__->dataLength = (dataLength__); \
@@ -2004,7 +2004,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
2004 2004
2005*******************************************************************************/ 2005*******************************************************************************/
2006#define CsrWifiRouterCtrlWifiOnIndCreate(msg__, dst__, src__, clientData__, status__, versions__) \ 2006#define CsrWifiRouterCtrlWifiOnIndCreate(msg__, dst__, src__, clientData__, status__, versions__) \
2007 msg__ = (CsrWifiRouterCtrlWifiOnInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWifiOnInd)); \ 2007 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlWifiOnInd), GFP_KERNEL); \
2008 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WIFI_ON_IND, dst__, src__); \ 2008 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WIFI_ON_IND, dst__, src__); \
2009 msg__->clientData = (clientData__); \ 2009 msg__->clientData = (clientData__); \
2010 msg__->status = (status__); \ 2010 msg__->status = (status__); \
@@ -2037,7 +2037,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
2037 2037
2038*******************************************************************************/ 2038*******************************************************************************/
2039#define CsrWifiRouterCtrlWifiOnResCreate(msg__, dst__, src__, clientData__, status__, numInterfaceAddress__, stationMacAddress__, smeVersions__, scheduledInterrupt__) \ 2039#define CsrWifiRouterCtrlWifiOnResCreate(msg__, dst__, src__, clientData__, status__, numInterfaceAddress__, stationMacAddress__, smeVersions__, scheduledInterrupt__) \
2040 msg__ = (CsrWifiRouterCtrlWifiOnRes *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWifiOnRes)); \ 2040 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlWifiOnRes), GFP_KERNEL); \
2041 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WIFI_ON_RES, dst__, src__); \ 2041 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WIFI_ON_RES, dst__, src__); \
2042 msg__->clientData = (clientData__); \ 2042 msg__->clientData = (clientData__); \
2043 msg__->status = (status__); \ 2043 msg__->status = (status__); \
@@ -2070,7 +2070,7 @@ extern const char *CsrWifiRouterCtrlDownstreamPrimNames[CSR_WIFI_ROUTER_CTRL_PRI
2070 2070
2071*******************************************************************************/ 2071*******************************************************************************/
2072#define CsrWifiRouterCtrlWifiOnCfmCreate(msg__, dst__, src__, clientData__, status__) \ 2072#define CsrWifiRouterCtrlWifiOnCfmCreate(msg__, dst__, src__, clientData__, status__) \
2073 msg__ = (CsrWifiRouterCtrlWifiOnCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWifiOnCfm)); \ 2073 msg__ = kmalloc(sizeof(CsrWifiRouterCtrlWifiOnCfm), GFP_KERNEL); \
2074 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WIFI_ON_CFM, dst__, src__); \ 2074 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_CTRL_PRIM, CSR_WIFI_ROUTER_CTRL_WIFI_ON_CFM, dst__, src__); \
2075 msg__->clientData = (clientData__); \ 2075 msg__->clientData = (clientData__); \
2076 msg__->status = (status__); 2076 msg__->status = (status__);
diff --git a/drivers/staging/csr/csr_wifi_router_ctrl_serialize.c b/drivers/staging/csr/csr_wifi_router_ctrl_serialize.c
index 7340f58b6599..e4b7ec945490 100644
--- a/drivers/staging/csr/csr_wifi_router_ctrl_serialize.c
+++ b/drivers/staging/csr/csr_wifi_router_ctrl_serialize.c
@@ -51,7 +51,7 @@ u8* CsrWifiRouterCtrlConfigurePowerModeReqSer(u8 *ptr, size_t *len, void *msg)
51 51
52void* CsrWifiRouterCtrlConfigurePowerModeReqDes(u8 *buffer, size_t length) 52void* CsrWifiRouterCtrlConfigurePowerModeReqDes(u8 *buffer, size_t length)
53{ 53{
54 CsrWifiRouterCtrlConfigurePowerModeReq *primitive = (CsrWifiRouterCtrlConfigurePowerModeReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlConfigurePowerModeReq)); 54 CsrWifiRouterCtrlConfigurePowerModeReq *primitive = kmalloc(sizeof(CsrWifiRouterCtrlConfigurePowerModeReq), GFP_KERNEL);
55 size_t offset; 55 size_t offset;
56 offset = 0; 56 offset = 0;
57 57
@@ -106,7 +106,7 @@ u8* CsrWifiRouterCtrlHipReqSer(u8 *ptr, size_t *len, void *msg)
106 106
107void* CsrWifiRouterCtrlHipReqDes(u8 *buffer, size_t length) 107void* CsrWifiRouterCtrlHipReqDes(u8 *buffer, size_t length)
108{ 108{
109 CsrWifiRouterCtrlHipReq *primitive = (CsrWifiRouterCtrlHipReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlHipReq)); 109 CsrWifiRouterCtrlHipReq *primitive = kmalloc(sizeof(CsrWifiRouterCtrlHipReq), GFP_KERNEL);
110 size_t offset; 110 size_t offset;
111 offset = 0; 111 offset = 0;
112 112
@@ -114,7 +114,7 @@ void* CsrWifiRouterCtrlHipReqDes(u8 *buffer, size_t length)
114 CsrUint16Des((u16 *) &primitive->mlmeCommandLength, buffer, &offset); 114 CsrUint16Des((u16 *) &primitive->mlmeCommandLength, buffer, &offset);
115 if (primitive->mlmeCommandLength) 115 if (primitive->mlmeCommandLength)
116 { 116 {
117 primitive->mlmeCommand = (u8 *)CsrPmemAlloc(primitive->mlmeCommandLength); 117 primitive->mlmeCommand = kmalloc(primitive->mlmeCommandLength, GFP_KERNEL);
118 CsrMemCpyDes(primitive->mlmeCommand, buffer, &offset, ((u16) (primitive->mlmeCommandLength))); 118 CsrMemCpyDes(primitive->mlmeCommand, buffer, &offset, ((u16) (primitive->mlmeCommandLength)));
119 } 119 }
120 else 120 else
@@ -124,7 +124,7 @@ void* CsrWifiRouterCtrlHipReqDes(u8 *buffer, size_t length)
124 CsrUint16Des((u16 *) &primitive->dataRef1Length, buffer, &offset); 124 CsrUint16Des((u16 *) &primitive->dataRef1Length, buffer, &offset);
125 if (primitive->dataRef1Length) 125 if (primitive->dataRef1Length)
126 { 126 {
127 primitive->dataRef1 = (u8 *)CsrPmemAlloc(primitive->dataRef1Length); 127 primitive->dataRef1 = kmalloc(primitive->dataRef1Length, GFP_KERNEL);
128 CsrMemCpyDes(primitive->dataRef1, buffer, &offset, ((u16) (primitive->dataRef1Length))); 128 CsrMemCpyDes(primitive->dataRef1, buffer, &offset, ((u16) (primitive->dataRef1Length)));
129 } 129 }
130 else 130 else
@@ -134,7 +134,7 @@ void* CsrWifiRouterCtrlHipReqDes(u8 *buffer, size_t length)
134 CsrUint16Des((u16 *) &primitive->dataRef2Length, buffer, &offset); 134 CsrUint16Des((u16 *) &primitive->dataRef2Length, buffer, &offset);
135 if (primitive->dataRef2Length) 135 if (primitive->dataRef2Length)
136 { 136 {
137 primitive->dataRef2 = (u8 *)CsrPmemAlloc(primitive->dataRef2Length); 137 primitive->dataRef2 = kmalloc(primitive->dataRef2Length, GFP_KERNEL);
138 CsrMemCpyDes(primitive->dataRef2, buffer, &offset, ((u16) (primitive->dataRef2Length))); 138 CsrMemCpyDes(primitive->dataRef2, buffer, &offset, ((u16) (primitive->dataRef2Length)));
139 } 139 }
140 else 140 else
@@ -182,7 +182,7 @@ u8* CsrWifiRouterCtrlMediaStatusReqSer(u8 *ptr, size_t *len, void *msg)
182 182
183void* CsrWifiRouterCtrlMediaStatusReqDes(u8 *buffer, size_t length) 183void* CsrWifiRouterCtrlMediaStatusReqDes(u8 *buffer, size_t length)
184{ 184{
185 CsrWifiRouterCtrlMediaStatusReq *primitive = (CsrWifiRouterCtrlMediaStatusReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlMediaStatusReq)); 185 CsrWifiRouterCtrlMediaStatusReq *primitive = kmalloc(sizeof(CsrWifiRouterCtrlMediaStatusReq), GFP_KERNEL);
186 size_t offset; 186 size_t offset;
187 offset = 0; 187 offset = 0;
188 188
@@ -240,7 +240,7 @@ u8* CsrWifiRouterCtrlMulticastAddressResSer(u8 *ptr, size_t *len, void *msg)
240 240
241void* CsrWifiRouterCtrlMulticastAddressResDes(u8 *buffer, size_t length) 241void* CsrWifiRouterCtrlMulticastAddressResDes(u8 *buffer, size_t length)
242{ 242{
243 CsrWifiRouterCtrlMulticastAddressRes *primitive = (CsrWifiRouterCtrlMulticastAddressRes *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlMulticastAddressRes)); 243 CsrWifiRouterCtrlMulticastAddressRes *primitive = kmalloc(sizeof(CsrWifiRouterCtrlMulticastAddressRes), GFP_KERNEL);
244 size_t offset; 244 size_t offset;
245 offset = 0; 245 offset = 0;
246 246
@@ -253,7 +253,7 @@ void* CsrWifiRouterCtrlMulticastAddressResDes(u8 *buffer, size_t length)
253 primitive->getAddresses = NULL; 253 primitive->getAddresses = NULL;
254 if (primitive->getAddressesCount) 254 if (primitive->getAddressesCount)
255 { 255 {
256 primitive->getAddresses = (CsrWifiMacAddress *)CsrPmemAlloc(sizeof(CsrWifiMacAddress) * primitive->getAddressesCount); 256 primitive->getAddresses = kmalloc(sizeof(CsrWifiMacAddress) * primitive->getAddressesCount, GFP_KERNEL);
257 } 257 }
258 { 258 {
259 u16 i1; 259 u16 i1;
@@ -307,7 +307,7 @@ u8* CsrWifiRouterCtrlPortConfigureReqSer(u8 *ptr, size_t *len, void *msg)
307 307
308void* CsrWifiRouterCtrlPortConfigureReqDes(u8 *buffer, size_t length) 308void* CsrWifiRouterCtrlPortConfigureReqDes(u8 *buffer, size_t length)
309{ 309{
310 CsrWifiRouterCtrlPortConfigureReq *primitive = (CsrWifiRouterCtrlPortConfigureReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlPortConfigureReq)); 310 CsrWifiRouterCtrlPortConfigureReq *primitive = kmalloc(sizeof(CsrWifiRouterCtrlPortConfigureReq), GFP_KERNEL);
311 size_t offset; 311 size_t offset;
312 offset = 0; 312 offset = 0;
313 313
@@ -351,7 +351,7 @@ u8* CsrWifiRouterCtrlQosControlReqSer(u8 *ptr, size_t *len, void *msg)
351 351
352void* CsrWifiRouterCtrlQosControlReqDes(u8 *buffer, size_t length) 352void* CsrWifiRouterCtrlQosControlReqDes(u8 *buffer, size_t length)
353{ 353{
354 CsrWifiRouterCtrlQosControlReq *primitive = (CsrWifiRouterCtrlQosControlReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlQosControlReq)); 354 CsrWifiRouterCtrlQosControlReq *primitive = kmalloc(sizeof(CsrWifiRouterCtrlQosControlReq), GFP_KERNEL);
355 size_t offset; 355 size_t offset;
356 offset = 0; 356 offset = 0;
357 357
@@ -389,7 +389,7 @@ u8* CsrWifiRouterCtrlSuspendResSer(u8 *ptr, size_t *len, void *msg)
389 389
390void* CsrWifiRouterCtrlSuspendResDes(u8 *buffer, size_t length) 390void* CsrWifiRouterCtrlSuspendResDes(u8 *buffer, size_t length)
391{ 391{
392 CsrWifiRouterCtrlSuspendRes *primitive = (CsrWifiRouterCtrlSuspendRes *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlSuspendRes)); 392 CsrWifiRouterCtrlSuspendRes *primitive = kmalloc(sizeof(CsrWifiRouterCtrlSuspendRes), GFP_KERNEL);
393 size_t offset; 393 size_t offset;
394 offset = 0; 394 offset = 0;
395 395
@@ -433,7 +433,7 @@ u8* CsrWifiRouterCtrlTclasAddReqSer(u8 *ptr, size_t *len, void *msg)
433 433
434void* CsrWifiRouterCtrlTclasAddReqDes(u8 *buffer, size_t length) 434void* CsrWifiRouterCtrlTclasAddReqDes(u8 *buffer, size_t length)
435{ 435{
436 CsrWifiRouterCtrlTclasAddReq *primitive = (CsrWifiRouterCtrlTclasAddReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlTclasAddReq)); 436 CsrWifiRouterCtrlTclasAddReq *primitive = kmalloc(sizeof(CsrWifiRouterCtrlTclasAddReq), GFP_KERNEL);
437 size_t offset; 437 size_t offset;
438 offset = 0; 438 offset = 0;
439 439
@@ -443,7 +443,7 @@ void* CsrWifiRouterCtrlTclasAddReqDes(u8 *buffer, size_t length)
443 CsrUint16Des((u16 *) &primitive->tclasLength, buffer, &offset); 443 CsrUint16Des((u16 *) &primitive->tclasLength, buffer, &offset);
444 if (primitive->tclasLength) 444 if (primitive->tclasLength)
445 { 445 {
446 primitive->tclas = (u8 *)CsrPmemAlloc(primitive->tclasLength); 446 primitive->tclas = kmalloc(primitive->tclasLength, GFP_KERNEL);
447 CsrMemCpyDes(primitive->tclas, buffer, &offset, ((u16) (primitive->tclasLength))); 447 CsrMemCpyDes(primitive->tclas, buffer, &offset, ((u16) (primitive->tclasLength)));
448 } 448 }
449 else 449 else
@@ -487,7 +487,7 @@ u8* CsrWifiRouterCtrlResumeResSer(u8 *ptr, size_t *len, void *msg)
487 487
488void* CsrWifiRouterCtrlResumeResDes(u8 *buffer, size_t length) 488void* CsrWifiRouterCtrlResumeResDes(u8 *buffer, size_t length)
489{ 489{
490 CsrWifiRouterCtrlResumeRes *primitive = (CsrWifiRouterCtrlResumeRes *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlResumeRes)); 490 CsrWifiRouterCtrlResumeRes *primitive = kmalloc(sizeof(CsrWifiRouterCtrlResumeRes), GFP_KERNEL);
491 size_t offset; 491 size_t offset;
492 offset = 0; 492 offset = 0;
493 493
@@ -531,7 +531,7 @@ u8* CsrWifiRouterCtrlTclasDelReqSer(u8 *ptr, size_t *len, void *msg)
531 531
532void* CsrWifiRouterCtrlTclasDelReqDes(u8 *buffer, size_t length) 532void* CsrWifiRouterCtrlTclasDelReqDes(u8 *buffer, size_t length)
533{ 533{
534 CsrWifiRouterCtrlTclasDelReq *primitive = (CsrWifiRouterCtrlTclasDelReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlTclasDelReq)); 534 CsrWifiRouterCtrlTclasDelReq *primitive = kmalloc(sizeof(CsrWifiRouterCtrlTclasDelReq), GFP_KERNEL);
535 size_t offset; 535 size_t offset;
536 offset = 0; 536 offset = 0;
537 537
@@ -541,7 +541,7 @@ void* CsrWifiRouterCtrlTclasDelReqDes(u8 *buffer, size_t length)
541 CsrUint16Des((u16 *) &primitive->tclasLength, buffer, &offset); 541 CsrUint16Des((u16 *) &primitive->tclasLength, buffer, &offset);
542 if (primitive->tclasLength) 542 if (primitive->tclasLength)
543 { 543 {
544 primitive->tclas = (u8 *)CsrPmemAlloc(primitive->tclasLength); 544 primitive->tclas = kmalloc(primitive->tclasLength, GFP_KERNEL);
545 CsrMemCpyDes(primitive->tclas, buffer, &offset, ((u16) (primitive->tclasLength))); 545 CsrMemCpyDes(primitive->tclas, buffer, &offset, ((u16) (primitive->tclasLength)));
546 } 546 }
547 else 547 else
@@ -589,7 +589,7 @@ u8* CsrWifiRouterCtrlTrafficClassificationReqSer(u8 *ptr, size_t *len, void *msg
589 589
590void* CsrWifiRouterCtrlTrafficClassificationReqDes(u8 *buffer, size_t length) 590void* CsrWifiRouterCtrlTrafficClassificationReqDes(u8 *buffer, size_t length)
591{ 591{
592 CsrWifiRouterCtrlTrafficClassificationReq *primitive = (CsrWifiRouterCtrlTrafficClassificationReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlTrafficClassificationReq)); 592 CsrWifiRouterCtrlTrafficClassificationReq *primitive = kmalloc(sizeof(CsrWifiRouterCtrlTrafficClassificationReq), GFP_KERNEL);
593 size_t offset; 593 size_t offset;
594 offset = 0; 594 offset = 0;
595 595
@@ -639,7 +639,7 @@ u8* CsrWifiRouterCtrlTrafficConfigReqSer(u8 *ptr, size_t *len, void *msg)
639 639
640void* CsrWifiRouterCtrlTrafficConfigReqDes(u8 *buffer, size_t length) 640void* CsrWifiRouterCtrlTrafficConfigReqDes(u8 *buffer, size_t length)
641{ 641{
642 CsrWifiRouterCtrlTrafficConfigReq *primitive = (CsrWifiRouterCtrlTrafficConfigReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlTrafficConfigReq)); 642 CsrWifiRouterCtrlTrafficConfigReq *primitive = kmalloc(sizeof(CsrWifiRouterCtrlTrafficConfigReq), GFP_KERNEL);
643 size_t offset; 643 size_t offset;
644 offset = 0; 644 offset = 0;
645 645
@@ -687,7 +687,7 @@ u8* CsrWifiRouterCtrlWifiOnReqSer(u8 *ptr, size_t *len, void *msg)
687 687
688void* CsrWifiRouterCtrlWifiOnReqDes(u8 *buffer, size_t length) 688void* CsrWifiRouterCtrlWifiOnReqDes(u8 *buffer, size_t length)
689{ 689{
690 CsrWifiRouterCtrlWifiOnReq *primitive = (CsrWifiRouterCtrlWifiOnReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWifiOnReq)); 690 CsrWifiRouterCtrlWifiOnReq *primitive = kmalloc(sizeof(CsrWifiRouterCtrlWifiOnReq), GFP_KERNEL);
691 size_t offset; 691 size_t offset;
692 offset = 0; 692 offset = 0;
693 693
@@ -696,7 +696,7 @@ void* CsrWifiRouterCtrlWifiOnReqDes(u8 *buffer, size_t length)
696 CsrUint32Des((u32 *) &primitive->dataLength, buffer, &offset); 696 CsrUint32Des((u32 *) &primitive->dataLength, buffer, &offset);
697 if (primitive->dataLength) 697 if (primitive->dataLength)
698 { 698 {
699 primitive->data = (u8 *)CsrPmemAlloc(primitive->dataLength); 699 primitive->data = kmalloc(primitive->dataLength, GFP_KERNEL);
700 CsrMemCpyDes(primitive->data, buffer, &offset, ((u16) (primitive->dataLength))); 700 CsrMemCpyDes(primitive->data, buffer, &offset, ((u16) (primitive->dataLength)));
701 } 701 }
702 else 702 else
@@ -765,7 +765,7 @@ u8* CsrWifiRouterCtrlWifiOnResSer(u8 *ptr, size_t *len, void *msg)
765 765
766void* CsrWifiRouterCtrlWifiOnResDes(u8 *buffer, size_t length) 766void* CsrWifiRouterCtrlWifiOnResDes(u8 *buffer, size_t length)
767{ 767{
768 CsrWifiRouterCtrlWifiOnRes *primitive = (CsrWifiRouterCtrlWifiOnRes *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWifiOnRes)); 768 CsrWifiRouterCtrlWifiOnRes *primitive = kmalloc(sizeof(CsrWifiRouterCtrlWifiOnRes), GFP_KERNEL);
769 size_t offset; 769 size_t offset;
770 offset = 0; 770 offset = 0;
771 771
@@ -821,7 +821,7 @@ u8* CsrWifiRouterCtrlM4TransmitReqSer(u8 *ptr, size_t *len, void *msg)
821 821
822void* CsrWifiRouterCtrlM4TransmitReqDes(u8 *buffer, size_t length) 822void* CsrWifiRouterCtrlM4TransmitReqDes(u8 *buffer, size_t length)
823{ 823{
824 CsrWifiRouterCtrlM4TransmitReq *primitive = (CsrWifiRouterCtrlM4TransmitReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlM4TransmitReq)); 824 CsrWifiRouterCtrlM4TransmitReq *primitive = kmalloc(sizeof(CsrWifiRouterCtrlM4TransmitReq), GFP_KERNEL);
825 size_t offset; 825 size_t offset;
826 offset = 0; 826 offset = 0;
827 827
@@ -865,7 +865,7 @@ u8* CsrWifiRouterCtrlModeSetReqSer(u8 *ptr, size_t *len, void *msg)
865 865
866void* CsrWifiRouterCtrlModeSetReqDes(u8 *buffer, size_t length) 866void* CsrWifiRouterCtrlModeSetReqDes(u8 *buffer, size_t length)
867{ 867{
868 CsrWifiRouterCtrlModeSetReq *primitive = (CsrWifiRouterCtrlModeSetReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlModeSetReq)); 868 CsrWifiRouterCtrlModeSetReq *primitive = kmalloc(sizeof(CsrWifiRouterCtrlModeSetReq), GFP_KERNEL);
869 size_t offset; 869 size_t offset;
870 offset = 0; 870 offset = 0;
871 871
@@ -917,7 +917,7 @@ u8* CsrWifiRouterCtrlPeerAddReqSer(u8 *ptr, size_t *len, void *msg)
917 917
918void* CsrWifiRouterCtrlPeerAddReqDes(u8 *buffer, size_t length) 918void* CsrWifiRouterCtrlPeerAddReqDes(u8 *buffer, size_t length)
919{ 919{
920 CsrWifiRouterCtrlPeerAddReq *primitive = (CsrWifiRouterCtrlPeerAddReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlPeerAddReq)); 920 CsrWifiRouterCtrlPeerAddReq *primitive = kmalloc(sizeof(CsrWifiRouterCtrlPeerAddReq), GFP_KERNEL);
921 size_t offset; 921 size_t offset;
922 offset = 0; 922 offset = 0;
923 923
@@ -961,7 +961,7 @@ u8* CsrWifiRouterCtrlPeerDelReqSer(u8 *ptr, size_t *len, void *msg)
961 961
962void* CsrWifiRouterCtrlPeerDelReqDes(u8 *buffer, size_t length) 962void* CsrWifiRouterCtrlPeerDelReqDes(u8 *buffer, size_t length)
963{ 963{
964 CsrWifiRouterCtrlPeerDelReq *primitive = (CsrWifiRouterCtrlPeerDelReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlPeerDelReq)); 964 CsrWifiRouterCtrlPeerDelReq *primitive = kmalloc(sizeof(CsrWifiRouterCtrlPeerDelReq), GFP_KERNEL);
965 size_t offset; 965 size_t offset;
966 offset = 0; 966 offset = 0;
967 967
@@ -1002,7 +1002,7 @@ u8* CsrWifiRouterCtrlPeerUpdateReqSer(u8 *ptr, size_t *len, void *msg)
1002 1002
1003void* CsrWifiRouterCtrlPeerUpdateReqDes(u8 *buffer, size_t length) 1003void* CsrWifiRouterCtrlPeerUpdateReqDes(u8 *buffer, size_t length)
1004{ 1004{
1005 CsrWifiRouterCtrlPeerUpdateReq *primitive = (CsrWifiRouterCtrlPeerUpdateReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlPeerUpdateReq)); 1005 CsrWifiRouterCtrlPeerUpdateReq *primitive = kmalloc(sizeof(CsrWifiRouterCtrlPeerUpdateReq), GFP_KERNEL);
1006 size_t offset; 1006 size_t offset;
1007 offset = 0; 1007 offset = 0;
1008 1008
@@ -1052,7 +1052,7 @@ u8* CsrWifiRouterCtrlBlockAckEnableReqSer(u8 *ptr, size_t *len, void *msg)
1052 1052
1053void* CsrWifiRouterCtrlBlockAckEnableReqDes(u8 *buffer, size_t length) 1053void* CsrWifiRouterCtrlBlockAckEnableReqDes(u8 *buffer, size_t length)
1054{ 1054{
1055 CsrWifiRouterCtrlBlockAckEnableReq *primitive = (CsrWifiRouterCtrlBlockAckEnableReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlBlockAckEnableReq)); 1055 CsrWifiRouterCtrlBlockAckEnableReq *primitive = kmalloc(sizeof(CsrWifiRouterCtrlBlockAckEnableReq), GFP_KERNEL);
1056 size_t offset; 1056 size_t offset;
1057 offset = 0; 1057 offset = 0;
1058 1058
@@ -1100,7 +1100,7 @@ u8* CsrWifiRouterCtrlBlockAckDisableReqSer(u8 *ptr, size_t *len, void *msg)
1100 1100
1101void* CsrWifiRouterCtrlBlockAckDisableReqDes(u8 *buffer, size_t length) 1101void* CsrWifiRouterCtrlBlockAckDisableReqDes(u8 *buffer, size_t length)
1102{ 1102{
1103 CsrWifiRouterCtrlBlockAckDisableReq *primitive = (CsrWifiRouterCtrlBlockAckDisableReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlBlockAckDisableReq)); 1103 CsrWifiRouterCtrlBlockAckDisableReq *primitive = kmalloc(sizeof(CsrWifiRouterCtrlBlockAckDisableReq), GFP_KERNEL);
1104 size_t offset; 1104 size_t offset;
1105 offset = 0; 1105 offset = 0;
1106 1106
@@ -1152,7 +1152,7 @@ u8* CsrWifiRouterCtrlWapiRxPktReqSer(u8 *ptr, size_t *len, void *msg)
1152 1152
1153void* CsrWifiRouterCtrlWapiRxPktReqDes(u8 *buffer, size_t length) 1153void* CsrWifiRouterCtrlWapiRxPktReqDes(u8 *buffer, size_t length)
1154{ 1154{
1155 CsrWifiRouterCtrlWapiRxPktReq *primitive = (CsrWifiRouterCtrlWapiRxPktReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWapiRxPktReq)); 1155 CsrWifiRouterCtrlWapiRxPktReq *primitive = kmalloc(sizeof(CsrWifiRouterCtrlWapiRxPktReq), GFP_KERNEL);
1156 size_t offset; 1156 size_t offset;
1157 offset = 0; 1157 offset = 0;
1158 1158
@@ -1161,7 +1161,7 @@ void* CsrWifiRouterCtrlWapiRxPktReqDes(u8 *buffer, size_t length)
1161 CsrUint16Des((u16 *) &primitive->signalLength, buffer, &offset); 1161 CsrUint16Des((u16 *) &primitive->signalLength, buffer, &offset);
1162 if (primitive->signalLength) 1162 if (primitive->signalLength)
1163 { 1163 {
1164 primitive->signal = (u8 *)CsrPmemAlloc(primitive->signalLength); 1164 primitive->signal = kmalloc(primitive->signalLength, GFP_KERNEL);
1165 CsrMemCpyDes(primitive->signal, buffer, &offset, ((u16) (primitive->signalLength))); 1165 CsrMemCpyDes(primitive->signal, buffer, &offset, ((u16) (primitive->signalLength)));
1166 } 1166 }
1167 else 1167 else
@@ -1171,7 +1171,7 @@ void* CsrWifiRouterCtrlWapiRxPktReqDes(u8 *buffer, size_t length)
1171 CsrUint16Des((u16 *) &primitive->dataLength, buffer, &offset); 1171 CsrUint16Des((u16 *) &primitive->dataLength, buffer, &offset);
1172 if (primitive->dataLength) 1172 if (primitive->dataLength)
1173 { 1173 {
1174 primitive->data = (u8 *)CsrPmemAlloc(primitive->dataLength); 1174 primitive->data = kmalloc(primitive->dataLength, GFP_KERNEL);
1175 CsrMemCpyDes(primitive->data, buffer, &offset, ((u16) (primitive->dataLength))); 1175 CsrMemCpyDes(primitive->data, buffer, &offset, ((u16) (primitive->dataLength)));
1176 } 1176 }
1177 else 1177 else
@@ -1222,7 +1222,7 @@ u8* CsrWifiRouterCtrlWapiUnicastTxPktReqSer(u8 *ptr, size_t *len, void *msg)
1222 1222
1223void* CsrWifiRouterCtrlWapiUnicastTxPktReqDes(u8 *buffer, size_t length) 1223void* CsrWifiRouterCtrlWapiUnicastTxPktReqDes(u8 *buffer, size_t length)
1224{ 1224{
1225 CsrWifiRouterCtrlWapiUnicastTxPktReq *primitive = (CsrWifiRouterCtrlWapiUnicastTxPktReq *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWapiUnicastTxPktReq)); 1225 CsrWifiRouterCtrlWapiUnicastTxPktReq *primitive = kmalloc(sizeof(CsrWifiRouterCtrlWapiUnicastTxPktReq), GFP_KERNEL);
1226 size_t offset; 1226 size_t offset;
1227 offset = 0; 1227 offset = 0;
1228 1228
@@ -1231,7 +1231,7 @@ void* CsrWifiRouterCtrlWapiUnicastTxPktReqDes(u8 *buffer, size_t length)
1231 CsrUint16Des((u16 *) &primitive->dataLength, buffer, &offset); 1231 CsrUint16Des((u16 *) &primitive->dataLength, buffer, &offset);
1232 if (primitive->dataLength) 1232 if (primitive->dataLength)
1233 { 1233 {
1234 primitive->data = (u8 *)CsrPmemAlloc(primitive->dataLength); 1234 primitive->data = kmalloc(primitive->dataLength, GFP_KERNEL);
1235 CsrMemCpyDes(primitive->data, buffer, &offset, ((u16) (primitive->dataLength))); 1235 CsrMemCpyDes(primitive->data, buffer, &offset, ((u16) (primitive->dataLength)));
1236 } 1236 }
1237 else 1237 else
@@ -1293,7 +1293,7 @@ u8* CsrWifiRouterCtrlHipIndSer(u8 *ptr, size_t *len, void *msg)
1293 1293
1294void* CsrWifiRouterCtrlHipIndDes(u8 *buffer, size_t length) 1294void* CsrWifiRouterCtrlHipIndDes(u8 *buffer, size_t length)
1295{ 1295{
1296 CsrWifiRouterCtrlHipInd *primitive = (CsrWifiRouterCtrlHipInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlHipInd)); 1296 CsrWifiRouterCtrlHipInd *primitive = kmalloc(sizeof(CsrWifiRouterCtrlHipInd), GFP_KERNEL);
1297 size_t offset; 1297 size_t offset;
1298 offset = 0; 1298 offset = 0;
1299 1299
@@ -1301,7 +1301,7 @@ void* CsrWifiRouterCtrlHipIndDes(u8 *buffer, size_t length)
1301 CsrUint16Des((u16 *) &primitive->mlmeCommandLength, buffer, &offset); 1301 CsrUint16Des((u16 *) &primitive->mlmeCommandLength, buffer, &offset);
1302 if (primitive->mlmeCommandLength) 1302 if (primitive->mlmeCommandLength)
1303 { 1303 {
1304 primitive->mlmeCommand = (u8 *)CsrPmemAlloc(primitive->mlmeCommandLength); 1304 primitive->mlmeCommand = kmalloc(primitive->mlmeCommandLength, GFP_KERNEL);
1305 CsrMemCpyDes(primitive->mlmeCommand, buffer, &offset, ((u16) (primitive->mlmeCommandLength))); 1305 CsrMemCpyDes(primitive->mlmeCommand, buffer, &offset, ((u16) (primitive->mlmeCommandLength)));
1306 } 1306 }
1307 else 1307 else
@@ -1311,7 +1311,7 @@ void* CsrWifiRouterCtrlHipIndDes(u8 *buffer, size_t length)
1311 CsrUint16Des((u16 *) &primitive->dataRef1Length, buffer, &offset); 1311 CsrUint16Des((u16 *) &primitive->dataRef1Length, buffer, &offset);
1312 if (primitive->dataRef1Length) 1312 if (primitive->dataRef1Length)
1313 { 1313 {
1314 primitive->dataRef1 = (u8 *)CsrPmemAlloc(primitive->dataRef1Length); 1314 primitive->dataRef1 = kmalloc(primitive->dataRef1Length, GFP_KERNEL);
1315 CsrMemCpyDes(primitive->dataRef1, buffer, &offset, ((u16) (primitive->dataRef1Length))); 1315 CsrMemCpyDes(primitive->dataRef1, buffer, &offset, ((u16) (primitive->dataRef1Length)));
1316 } 1316 }
1317 else 1317 else
@@ -1321,7 +1321,7 @@ void* CsrWifiRouterCtrlHipIndDes(u8 *buffer, size_t length)
1321 CsrUint16Des((u16 *) &primitive->dataRef2Length, buffer, &offset); 1321 CsrUint16Des((u16 *) &primitive->dataRef2Length, buffer, &offset);
1322 if (primitive->dataRef2Length) 1322 if (primitive->dataRef2Length)
1323 { 1323 {
1324 primitive->dataRef2 = (u8 *)CsrPmemAlloc(primitive->dataRef2Length); 1324 primitive->dataRef2 = kmalloc(primitive->dataRef2Length, GFP_KERNEL);
1325 CsrMemCpyDes(primitive->dataRef2, buffer, &offset, ((u16) (primitive->dataRef2Length))); 1325 CsrMemCpyDes(primitive->dataRef2, buffer, &offset, ((u16) (primitive->dataRef2Length)));
1326 } 1326 }
1327 else 1327 else
@@ -1386,7 +1386,7 @@ u8* CsrWifiRouterCtrlMulticastAddressIndSer(u8 *ptr, size_t *len, void *msg)
1386 1386
1387void* CsrWifiRouterCtrlMulticastAddressIndDes(u8 *buffer, size_t length) 1387void* CsrWifiRouterCtrlMulticastAddressIndDes(u8 *buffer, size_t length)
1388{ 1388{
1389 CsrWifiRouterCtrlMulticastAddressInd *primitive = (CsrWifiRouterCtrlMulticastAddressInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlMulticastAddressInd)); 1389 CsrWifiRouterCtrlMulticastAddressInd *primitive = kmalloc(sizeof(CsrWifiRouterCtrlMulticastAddressInd), GFP_KERNEL);
1390 size_t offset; 1390 size_t offset;
1391 offset = 0; 1391 offset = 0;
1392 1392
@@ -1398,7 +1398,7 @@ void* CsrWifiRouterCtrlMulticastAddressIndDes(u8 *buffer, size_t length)
1398 primitive->setAddresses = NULL; 1398 primitive->setAddresses = NULL;
1399 if (primitive->setAddressesCount) 1399 if (primitive->setAddressesCount)
1400 { 1400 {
1401 primitive->setAddresses = (CsrWifiMacAddress *)CsrPmemAlloc(sizeof(CsrWifiMacAddress) * primitive->setAddressesCount); 1401 primitive->setAddresses = kmalloc(sizeof(CsrWifiMacAddress) * primitive->setAddressesCount, GFP_KERNEL);
1402 } 1402 }
1403 { 1403 {
1404 u16 i1; 1404 u16 i1;
@@ -1448,7 +1448,7 @@ u8* CsrWifiRouterCtrlPortConfigureCfmSer(u8 *ptr, size_t *len, void *msg)
1448 1448
1449void* CsrWifiRouterCtrlPortConfigureCfmDes(u8 *buffer, size_t length) 1449void* CsrWifiRouterCtrlPortConfigureCfmDes(u8 *buffer, size_t length)
1450{ 1450{
1451 CsrWifiRouterCtrlPortConfigureCfm *primitive = (CsrWifiRouterCtrlPortConfigureCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlPortConfigureCfm)); 1451 CsrWifiRouterCtrlPortConfigureCfm *primitive = kmalloc(sizeof(CsrWifiRouterCtrlPortConfigureCfm), GFP_KERNEL);
1452 size_t offset; 1452 size_t offset;
1453 offset = 0; 1453 offset = 0;
1454 1454
@@ -1488,7 +1488,7 @@ u8* CsrWifiRouterCtrlSuspendIndSer(u8 *ptr, size_t *len, void *msg)
1488 1488
1489void* CsrWifiRouterCtrlSuspendIndDes(u8 *buffer, size_t length) 1489void* CsrWifiRouterCtrlSuspendIndDes(u8 *buffer, size_t length)
1490{ 1490{
1491 CsrWifiRouterCtrlSuspendInd *primitive = (CsrWifiRouterCtrlSuspendInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlSuspendInd)); 1491 CsrWifiRouterCtrlSuspendInd *primitive = kmalloc(sizeof(CsrWifiRouterCtrlSuspendInd), GFP_KERNEL);
1492 size_t offset; 1492 size_t offset;
1493 offset = 0; 1493 offset = 0;
1494 1494
@@ -1527,7 +1527,7 @@ u8* CsrWifiRouterCtrlTclasAddCfmSer(u8 *ptr, size_t *len, void *msg)
1527 1527
1528void* CsrWifiRouterCtrlTclasAddCfmDes(u8 *buffer, size_t length) 1528void* CsrWifiRouterCtrlTclasAddCfmDes(u8 *buffer, size_t length)
1529{ 1529{
1530 CsrWifiRouterCtrlTclasAddCfm *primitive = (CsrWifiRouterCtrlTclasAddCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlTclasAddCfm)); 1530 CsrWifiRouterCtrlTclasAddCfm *primitive = kmalloc(sizeof(CsrWifiRouterCtrlTclasAddCfm), GFP_KERNEL);
1531 size_t offset; 1531 size_t offset;
1532 offset = 0; 1532 offset = 0;
1533 1533
@@ -1564,7 +1564,7 @@ u8* CsrWifiRouterCtrlRawSdioDeinitialiseCfmSer(u8 *ptr, size_t *len, void *msg)
1564 1564
1565void* CsrWifiRouterCtrlRawSdioDeinitialiseCfmDes(u8 *buffer, size_t length) 1565void* CsrWifiRouterCtrlRawSdioDeinitialiseCfmDes(u8 *buffer, size_t length)
1566{ 1566{
1567 CsrWifiRouterCtrlRawSdioDeinitialiseCfm *primitive = (CsrWifiRouterCtrlRawSdioDeinitialiseCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlRawSdioDeinitialiseCfm)); 1567 CsrWifiRouterCtrlRawSdioDeinitialiseCfm *primitive = kmalloc(sizeof(CsrWifiRouterCtrlRawSdioDeinitialiseCfm), GFP_KERNEL);
1568 size_t offset; 1568 size_t offset;
1569 offset = 0; 1569 offset = 0;
1570 1570
@@ -1616,7 +1616,7 @@ u8* CsrWifiRouterCtrlRawSdioInitialiseCfmSer(u8 *ptr, size_t *len, void *msg)
1616 1616
1617void* CsrWifiRouterCtrlRawSdioInitialiseCfmDes(u8 *buffer, size_t length) 1617void* CsrWifiRouterCtrlRawSdioInitialiseCfmDes(u8 *buffer, size_t length)
1618{ 1618{
1619 CsrWifiRouterCtrlRawSdioInitialiseCfm *primitive = (CsrWifiRouterCtrlRawSdioInitialiseCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlRawSdioInitialiseCfm)); 1619 CsrWifiRouterCtrlRawSdioInitialiseCfm *primitive = kmalloc(sizeof(CsrWifiRouterCtrlRawSdioInitialiseCfm), GFP_KERNEL);
1620 size_t offset; 1620 size_t offset;
1621 offset = 0; 1621 offset = 0;
1622 1622
@@ -1670,7 +1670,7 @@ u8* CsrWifiRouterCtrlTclasDelCfmSer(u8 *ptr, size_t *len, void *msg)
1670 1670
1671void* CsrWifiRouterCtrlTclasDelCfmDes(u8 *buffer, size_t length) 1671void* CsrWifiRouterCtrlTclasDelCfmDes(u8 *buffer, size_t length)
1672{ 1672{
1673 CsrWifiRouterCtrlTclasDelCfm *primitive = (CsrWifiRouterCtrlTclasDelCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlTclasDelCfm)); 1673 CsrWifiRouterCtrlTclasDelCfm *primitive = kmalloc(sizeof(CsrWifiRouterCtrlTclasDelCfm), GFP_KERNEL);
1674 size_t offset; 1674 size_t offset;
1675 offset = 0; 1675 offset = 0;
1676 1676
@@ -1713,7 +1713,7 @@ u8* CsrWifiRouterCtrlTrafficProtocolIndSer(u8 *ptr, size_t *len, void *msg)
1713 1713
1714void* CsrWifiRouterCtrlTrafficProtocolIndDes(u8 *buffer, size_t length) 1714void* CsrWifiRouterCtrlTrafficProtocolIndDes(u8 *buffer, size_t length)
1715{ 1715{
1716 CsrWifiRouterCtrlTrafficProtocolInd *primitive = (CsrWifiRouterCtrlTrafficProtocolInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlTrafficProtocolInd)); 1716 CsrWifiRouterCtrlTrafficProtocolInd *primitive = kmalloc(sizeof(CsrWifiRouterCtrlTrafficProtocolInd), GFP_KERNEL);
1717 size_t offset; 1717 size_t offset;
1718 offset = 0; 1718 offset = 0;
1719 1719
@@ -1764,7 +1764,7 @@ u8* CsrWifiRouterCtrlTrafficSampleIndSer(u8 *ptr, size_t *len, void *msg)
1764 1764
1765void* CsrWifiRouterCtrlTrafficSampleIndDes(u8 *buffer, size_t length) 1765void* CsrWifiRouterCtrlTrafficSampleIndDes(u8 *buffer, size_t length)
1766{ 1766{
1767 CsrWifiRouterCtrlTrafficSampleInd *primitive = (CsrWifiRouterCtrlTrafficSampleInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlTrafficSampleInd)); 1767 CsrWifiRouterCtrlTrafficSampleInd *primitive = kmalloc(sizeof(CsrWifiRouterCtrlTrafficSampleInd), GFP_KERNEL);
1768 size_t offset; 1768 size_t offset;
1769 offset = 0; 1769 offset = 0;
1770 1770
@@ -1819,7 +1819,7 @@ u8* CsrWifiRouterCtrlWifiOnIndSer(u8 *ptr, size_t *len, void *msg)
1819 1819
1820void* CsrWifiRouterCtrlWifiOnIndDes(u8 *buffer, size_t length) 1820void* CsrWifiRouterCtrlWifiOnIndDes(u8 *buffer, size_t length)
1821{ 1821{
1822 CsrWifiRouterCtrlWifiOnInd *primitive = (CsrWifiRouterCtrlWifiOnInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWifiOnInd)); 1822 CsrWifiRouterCtrlWifiOnInd *primitive = kmalloc(sizeof(CsrWifiRouterCtrlWifiOnInd), GFP_KERNEL);
1823 size_t offset; 1823 size_t offset;
1824 offset = 0; 1824 offset = 0;
1825 1825
@@ -1869,7 +1869,7 @@ u8* CsrWifiRouterCtrlWifiOnCfmSer(u8 *ptr, size_t *len, void *msg)
1869 1869
1870void* CsrWifiRouterCtrlWifiOnCfmDes(u8 *buffer, size_t length) 1870void* CsrWifiRouterCtrlWifiOnCfmDes(u8 *buffer, size_t length)
1871{ 1871{
1872 CsrWifiRouterCtrlWifiOnCfm *primitive = (CsrWifiRouterCtrlWifiOnCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWifiOnCfm)); 1872 CsrWifiRouterCtrlWifiOnCfm *primitive = kmalloc(sizeof(CsrWifiRouterCtrlWifiOnCfm), GFP_KERNEL);
1873 size_t offset; 1873 size_t offset;
1874 offset = 0; 1874 offset = 0;
1875 1875
@@ -1907,7 +1907,7 @@ u8* CsrWifiRouterCtrlM4ReadyToSendIndSer(u8 *ptr, size_t *len, void *msg)
1907 1907
1908void* CsrWifiRouterCtrlM4ReadyToSendIndDes(u8 *buffer, size_t length) 1908void* CsrWifiRouterCtrlM4ReadyToSendIndDes(u8 *buffer, size_t length)
1909{ 1909{
1910 CsrWifiRouterCtrlM4ReadyToSendInd *primitive = (CsrWifiRouterCtrlM4ReadyToSendInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlM4ReadyToSendInd)); 1910 CsrWifiRouterCtrlM4ReadyToSendInd *primitive = kmalloc(sizeof(CsrWifiRouterCtrlM4ReadyToSendInd), GFP_KERNEL);
1911 size_t offset; 1911 size_t offset;
1912 offset = 0; 1912 offset = 0;
1913 1913
@@ -1948,7 +1948,7 @@ u8* CsrWifiRouterCtrlM4TransmittedIndSer(u8 *ptr, size_t *len, void *msg)
1948 1948
1949void* CsrWifiRouterCtrlM4TransmittedIndDes(u8 *buffer, size_t length) 1949void* CsrWifiRouterCtrlM4TransmittedIndDes(u8 *buffer, size_t length)
1950{ 1950{
1951 CsrWifiRouterCtrlM4TransmittedInd *primitive = (CsrWifiRouterCtrlM4TransmittedInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlM4TransmittedInd)); 1951 CsrWifiRouterCtrlM4TransmittedInd *primitive = kmalloc(sizeof(CsrWifiRouterCtrlM4TransmittedInd), GFP_KERNEL);
1952 size_t offset; 1952 size_t offset;
1953 offset = 0; 1953 offset = 0;
1954 1954
@@ -1990,7 +1990,7 @@ u8* CsrWifiRouterCtrlMicFailureIndSer(u8 *ptr, size_t *len, void *msg)
1990 1990
1991void* CsrWifiRouterCtrlMicFailureIndDes(u8 *buffer, size_t length) 1991void* CsrWifiRouterCtrlMicFailureIndDes(u8 *buffer, size_t length)
1992{ 1992{
1993 CsrWifiRouterCtrlMicFailureInd *primitive = (CsrWifiRouterCtrlMicFailureInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlMicFailureInd)); 1993 CsrWifiRouterCtrlMicFailureInd *primitive = kmalloc(sizeof(CsrWifiRouterCtrlMicFailureInd), GFP_KERNEL);
1994 size_t offset; 1994 size_t offset;
1995 offset = 0; 1995 offset = 0;
1996 1996
@@ -2032,7 +2032,7 @@ u8* CsrWifiRouterCtrlConnectedIndSer(u8 *ptr, size_t *len, void *msg)
2032 2032
2033void* CsrWifiRouterCtrlConnectedIndDes(u8 *buffer, size_t length) 2033void* CsrWifiRouterCtrlConnectedIndDes(u8 *buffer, size_t length)
2034{ 2034{
2035 CsrWifiRouterCtrlConnectedInd *primitive = (CsrWifiRouterCtrlConnectedInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlConnectedInd)); 2035 CsrWifiRouterCtrlConnectedInd *primitive = kmalloc(sizeof(CsrWifiRouterCtrlConnectedInd), GFP_KERNEL);
2036 size_t offset; 2036 size_t offset;
2037 offset = 0; 2037 offset = 0;
2038 2038
@@ -2076,7 +2076,7 @@ u8* CsrWifiRouterCtrlPeerAddCfmSer(u8 *ptr, size_t *len, void *msg)
2076 2076
2077void* CsrWifiRouterCtrlPeerAddCfmDes(u8 *buffer, size_t length) 2077void* CsrWifiRouterCtrlPeerAddCfmDes(u8 *buffer, size_t length)
2078{ 2078{
2079 CsrWifiRouterCtrlPeerAddCfm *primitive = (CsrWifiRouterCtrlPeerAddCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlPeerAddCfm)); 2079 CsrWifiRouterCtrlPeerAddCfm *primitive = kmalloc(sizeof(CsrWifiRouterCtrlPeerAddCfm), GFP_KERNEL);
2080 size_t offset; 2080 size_t offset;
2081 offset = 0; 2081 offset = 0;
2082 2082
@@ -2117,7 +2117,7 @@ u8* CsrWifiRouterCtrlPeerDelCfmSer(u8 *ptr, size_t *len, void *msg)
2117 2117
2118void* CsrWifiRouterCtrlPeerDelCfmDes(u8 *buffer, size_t length) 2118void* CsrWifiRouterCtrlPeerDelCfmDes(u8 *buffer, size_t length)
2119{ 2119{
2120 CsrWifiRouterCtrlPeerDelCfm *primitive = (CsrWifiRouterCtrlPeerDelCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlPeerDelCfm)); 2120 CsrWifiRouterCtrlPeerDelCfm *primitive = kmalloc(sizeof(CsrWifiRouterCtrlPeerDelCfm), GFP_KERNEL);
2121 size_t offset; 2121 size_t offset;
2122 offset = 0; 2122 offset = 0;
2123 2123
@@ -2156,7 +2156,7 @@ u8* CsrWifiRouterCtrlUnexpectedFrameIndSer(u8 *ptr, size_t *len, void *msg)
2156 2156
2157void* CsrWifiRouterCtrlUnexpectedFrameIndDes(u8 *buffer, size_t length) 2157void* CsrWifiRouterCtrlUnexpectedFrameIndDes(u8 *buffer, size_t length)
2158{ 2158{
2159 CsrWifiRouterCtrlUnexpectedFrameInd *primitive = (CsrWifiRouterCtrlUnexpectedFrameInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlUnexpectedFrameInd)); 2159 CsrWifiRouterCtrlUnexpectedFrameInd *primitive = kmalloc(sizeof(CsrWifiRouterCtrlUnexpectedFrameInd), GFP_KERNEL);
2160 size_t offset; 2160 size_t offset;
2161 offset = 0; 2161 offset = 0;
2162 2162
@@ -2195,7 +2195,7 @@ u8* CsrWifiRouterCtrlPeerUpdateCfmSer(u8 *ptr, size_t *len, void *msg)
2195 2195
2196void* CsrWifiRouterCtrlPeerUpdateCfmDes(u8 *buffer, size_t length) 2196void* CsrWifiRouterCtrlPeerUpdateCfmDes(u8 *buffer, size_t length)
2197{ 2197{
2198 CsrWifiRouterCtrlPeerUpdateCfm *primitive = (CsrWifiRouterCtrlPeerUpdateCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlPeerUpdateCfm)); 2198 CsrWifiRouterCtrlPeerUpdateCfm *primitive = kmalloc(sizeof(CsrWifiRouterCtrlPeerUpdateCfm), GFP_KERNEL);
2199 size_t offset; 2199 size_t offset;
2200 offset = 0; 2200 offset = 0;
2201 2201
@@ -2234,7 +2234,7 @@ u8* CsrWifiRouterCtrlCapabilitiesCfmSer(u8 *ptr, size_t *len, void *msg)
2234 2234
2235void* CsrWifiRouterCtrlCapabilitiesCfmDes(u8 *buffer, size_t length) 2235void* CsrWifiRouterCtrlCapabilitiesCfmDes(u8 *buffer, size_t length)
2236{ 2236{
2237 CsrWifiRouterCtrlCapabilitiesCfm *primitive = (CsrWifiRouterCtrlCapabilitiesCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlCapabilitiesCfm)); 2237 CsrWifiRouterCtrlCapabilitiesCfm *primitive = kmalloc(sizeof(CsrWifiRouterCtrlCapabilitiesCfm), GFP_KERNEL);
2238 size_t offset; 2238 size_t offset;
2239 offset = 0; 2239 offset = 0;
2240 2240
@@ -2273,7 +2273,7 @@ u8* CsrWifiRouterCtrlBlockAckEnableCfmSer(u8 *ptr, size_t *len, void *msg)
2273 2273
2274void* CsrWifiRouterCtrlBlockAckEnableCfmDes(u8 *buffer, size_t length) 2274void* CsrWifiRouterCtrlBlockAckEnableCfmDes(u8 *buffer, size_t length)
2275{ 2275{
2276 CsrWifiRouterCtrlBlockAckEnableCfm *primitive = (CsrWifiRouterCtrlBlockAckEnableCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlBlockAckEnableCfm)); 2276 CsrWifiRouterCtrlBlockAckEnableCfm *primitive = kmalloc(sizeof(CsrWifiRouterCtrlBlockAckEnableCfm), GFP_KERNEL);
2277 size_t offset; 2277 size_t offset;
2278 offset = 0; 2278 offset = 0;
2279 2279
@@ -2312,7 +2312,7 @@ u8* CsrWifiRouterCtrlBlockAckDisableCfmSer(u8 *ptr, size_t *len, void *msg)
2312 2312
2313void* CsrWifiRouterCtrlBlockAckDisableCfmDes(u8 *buffer, size_t length) 2313void* CsrWifiRouterCtrlBlockAckDisableCfmDes(u8 *buffer, size_t length)
2314{ 2314{
2315 CsrWifiRouterCtrlBlockAckDisableCfm *primitive = (CsrWifiRouterCtrlBlockAckDisableCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlBlockAckDisableCfm)); 2315 CsrWifiRouterCtrlBlockAckDisableCfm *primitive = kmalloc(sizeof(CsrWifiRouterCtrlBlockAckDisableCfm), GFP_KERNEL);
2316 size_t offset; 2316 size_t offset;
2317 offset = 0; 2317 offset = 0;
2318 2318
@@ -2355,7 +2355,7 @@ u8* CsrWifiRouterCtrlBlockAckErrorIndSer(u8 *ptr, size_t *len, void *msg)
2355 2355
2356void* CsrWifiRouterCtrlBlockAckErrorIndDes(u8 *buffer, size_t length) 2356void* CsrWifiRouterCtrlBlockAckErrorIndDes(u8 *buffer, size_t length)
2357{ 2357{
2358 CsrWifiRouterCtrlBlockAckErrorInd *primitive = (CsrWifiRouterCtrlBlockAckErrorInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlBlockAckErrorInd)); 2358 CsrWifiRouterCtrlBlockAckErrorInd *primitive = kmalloc(sizeof(CsrWifiRouterCtrlBlockAckErrorInd), GFP_KERNEL);
2359 size_t offset; 2359 size_t offset;
2360 offset = 0; 2360 offset = 0;
2361 2361
@@ -2396,7 +2396,7 @@ u8* CsrWifiRouterCtrlStaInactiveIndSer(u8 *ptr, size_t *len, void *msg)
2396 2396
2397void* CsrWifiRouterCtrlStaInactiveIndDes(u8 *buffer, size_t length) 2397void* CsrWifiRouterCtrlStaInactiveIndDes(u8 *buffer, size_t length)
2398{ 2398{
2399 CsrWifiRouterCtrlStaInactiveInd *primitive = (CsrWifiRouterCtrlStaInactiveInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlStaInactiveInd)); 2399 CsrWifiRouterCtrlStaInactiveInd *primitive = kmalloc(sizeof(CsrWifiRouterCtrlStaInactiveInd), GFP_KERNEL);
2400 size_t offset; 2400 size_t offset;
2401 offset = 0; 2401 offset = 0;
2402 2402
@@ -2448,7 +2448,7 @@ u8* CsrWifiRouterCtrlWapiRxMicCheckIndSer(u8 *ptr, size_t *len, void *msg)
2448 2448
2449void* CsrWifiRouterCtrlWapiRxMicCheckIndDes(u8 *buffer, size_t length) 2449void* CsrWifiRouterCtrlWapiRxMicCheckIndDes(u8 *buffer, size_t length)
2450{ 2450{
2451 CsrWifiRouterCtrlWapiRxMicCheckInd *primitive = (CsrWifiRouterCtrlWapiRxMicCheckInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWapiRxMicCheckInd)); 2451 CsrWifiRouterCtrlWapiRxMicCheckInd *primitive = kmalloc(sizeof(CsrWifiRouterCtrlWapiRxMicCheckInd), GFP_KERNEL);
2452 size_t offset; 2452 size_t offset;
2453 offset = 0; 2453 offset = 0;
2454 2454
@@ -2458,7 +2458,7 @@ void* CsrWifiRouterCtrlWapiRxMicCheckIndDes(u8 *buffer, size_t length)
2458 CsrUint16Des((u16 *) &primitive->signalLength, buffer, &offset); 2458 CsrUint16Des((u16 *) &primitive->signalLength, buffer, &offset);
2459 if (primitive->signalLength) 2459 if (primitive->signalLength)
2460 { 2460 {
2461 primitive->signal = (u8 *)CsrPmemAlloc(primitive->signalLength); 2461 primitive->signal = kmalloc(primitive->signalLength, GFP_KERNEL);
2462 CsrMemCpyDes(primitive->signal, buffer, &offset, ((u16) (primitive->signalLength))); 2462 CsrMemCpyDes(primitive->signal, buffer, &offset, ((u16) (primitive->signalLength)));
2463 } 2463 }
2464 else 2464 else
@@ -2468,7 +2468,7 @@ void* CsrWifiRouterCtrlWapiRxMicCheckIndDes(u8 *buffer, size_t length)
2468 CsrUint16Des((u16 *) &primitive->dataLength, buffer, &offset); 2468 CsrUint16Des((u16 *) &primitive->dataLength, buffer, &offset);
2469 if (primitive->dataLength) 2469 if (primitive->dataLength)
2470 { 2470 {
2471 primitive->data = (u8 *)CsrPmemAlloc(primitive->dataLength); 2471 primitive->data = kmalloc(primitive->dataLength, GFP_KERNEL);
2472 CsrMemCpyDes(primitive->data, buffer, &offset, ((u16) (primitive->dataLength))); 2472 CsrMemCpyDes(primitive->data, buffer, &offset, ((u16) (primitive->dataLength)));
2473 } 2473 }
2474 else 2474 else
@@ -2517,7 +2517,7 @@ u8* CsrWifiRouterCtrlModeSetCfmSer(u8 *ptr, size_t *len, void *msg)
2517 2517
2518void* CsrWifiRouterCtrlModeSetCfmDes(u8 *buffer, size_t length) 2518void* CsrWifiRouterCtrlModeSetCfmDes(u8 *buffer, size_t length)
2519{ 2519{
2520 CsrWifiRouterCtrlModeSetCfm *primitive = (CsrWifiRouterCtrlModeSetCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlModeSetCfm)); 2520 CsrWifiRouterCtrlModeSetCfm *primitive = kmalloc(sizeof(CsrWifiRouterCtrlModeSetCfm), GFP_KERNEL);
2521 size_t offset; 2521 size_t offset;
2522 offset = 0; 2522 offset = 0;
2523 2523
@@ -2563,7 +2563,7 @@ u8* CsrWifiRouterCtrlWapiUnicastTxEncryptIndSer(u8 *ptr, size_t *len, void *msg)
2563 2563
2564void* CsrWifiRouterCtrlWapiUnicastTxEncryptIndDes(u8 *buffer, size_t length) 2564void* CsrWifiRouterCtrlWapiUnicastTxEncryptIndDes(u8 *buffer, size_t length)
2565{ 2565{
2566 CsrWifiRouterCtrlWapiUnicastTxEncryptInd *primitive = (CsrWifiRouterCtrlWapiUnicastTxEncryptInd *) CsrPmemAlloc(sizeof(CsrWifiRouterCtrlWapiUnicastTxEncryptInd)); 2566 CsrWifiRouterCtrlWapiUnicastTxEncryptInd *primitive = kmalloc(sizeof(CsrWifiRouterCtrlWapiUnicastTxEncryptInd), GFP_KERNEL);
2567 size_t offset; 2567 size_t offset;
2568 offset = 0; 2568 offset = 0;
2569 2569
@@ -2573,7 +2573,7 @@ void* CsrWifiRouterCtrlWapiUnicastTxEncryptIndDes(u8 *buffer, size_t length)
2573 CsrUint16Des((u16 *) &primitive->dataLength, buffer, &offset); 2573 CsrUint16Des((u16 *) &primitive->dataLength, buffer, &offset);
2574 if (primitive->dataLength) 2574 if (primitive->dataLength)
2575 { 2575 {
2576 primitive->data = (u8 *)CsrPmemAlloc(primitive->dataLength); 2576 primitive->data = kmalloc(primitive->dataLength, GFP_KERNEL);
2577 CsrMemCpyDes(primitive->data, buffer, &offset, ((u16) (primitive->dataLength))); 2577 CsrMemCpyDes(primitive->data, buffer, &offset, ((u16) (primitive->dataLength)));
2578 } 2578 }
2579 else 2579 else
diff --git a/drivers/staging/csr/csr_wifi_router_lib.h b/drivers/staging/csr/csr_wifi_router_lib.h
index e5f1f638d869..f2f5196d126e 100644
--- a/drivers/staging/csr/csr_wifi_router_lib.h
+++ b/drivers/staging/csr/csr_wifi_router_lib.h
@@ -99,7 +99,7 @@ extern const char *CsrWifiRouterDownstreamPrimNames[CSR_WIFI_ROUTER_PRIM_DOWNSTR
99 99
100*******************************************************************************/ 100*******************************************************************************/
101#define CsrWifiRouterMaPacketCancelReqCreate(msg__, dst__, src__, interfaceTag__, hostTag__, priority__, peerMacAddress__) \ 101#define CsrWifiRouterMaPacketCancelReqCreate(msg__, dst__, src__, interfaceTag__, hostTag__, priority__, peerMacAddress__) \
102 msg__ = (CsrWifiRouterMaPacketCancelReq *) CsrPmemAlloc(sizeof(CsrWifiRouterMaPacketCancelReq)); \ 102 msg__ = kmalloc(sizeof(CsrWifiRouterMaPacketCancelReq), GFP_KERNEL); \
103 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_PRIM, CSR_WIFI_ROUTER_MA_PACKET_CANCEL_REQ, dst__, src__); \ 103 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_PRIM, CSR_WIFI_ROUTER_MA_PACKET_CANCEL_REQ, dst__, src__); \
104 msg__->interfaceTag = (interfaceTag__); \ 104 msg__->interfaceTag = (interfaceTag__); \
105 msg__->hostTag = (hostTag__); \ 105 msg__->hostTag = (hostTag__); \
@@ -149,7 +149,7 @@ extern const char *CsrWifiRouterDownstreamPrimNames[CSR_WIFI_ROUTER_PRIM_DOWNSTR
149 149
150*******************************************************************************/ 150*******************************************************************************/
151#define CsrWifiRouterMaPacketReqCreate(msg__, dst__, src__, interfaceTag__, subscriptionHandle__, frameLength__, frame__, freeFunction__, priority__, hostTag__, cfmRequested__) \ 151#define CsrWifiRouterMaPacketReqCreate(msg__, dst__, src__, interfaceTag__, subscriptionHandle__, frameLength__, frame__, freeFunction__, priority__, hostTag__, cfmRequested__) \
152 msg__ = (CsrWifiRouterMaPacketReq *) CsrPmemAlloc(sizeof(CsrWifiRouterMaPacketReq)); \ 152 msg__ = kmalloc(sizeof(CsrWifiRouterMaPacketReq), GFP_KERNEL); \
153 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_PRIM, CSR_WIFI_ROUTER_MA_PACKET_REQ, dst__, src__); \ 153 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_PRIM, CSR_WIFI_ROUTER_MA_PACKET_REQ, dst__, src__); \
154 msg__->interfaceTag = (interfaceTag__); \ 154 msg__->interfaceTag = (interfaceTag__); \
155 msg__->subscriptionHandle = (subscriptionHandle__); \ 155 msg__->subscriptionHandle = (subscriptionHandle__); \
@@ -193,7 +193,7 @@ extern const char *CsrWifiRouterDownstreamPrimNames[CSR_WIFI_ROUTER_PRIM_DOWNSTR
193 193
194*******************************************************************************/ 194*******************************************************************************/
195#define CsrWifiRouterMaPacketIndCreate(msg__, dst__, src__, interfaceTag__, subscriptionHandle__, result__, frameLength__, frame__, freeFunction__, rssi__, snr__, rate__) \ 195#define CsrWifiRouterMaPacketIndCreate(msg__, dst__, src__, interfaceTag__, subscriptionHandle__, result__, frameLength__, frame__, freeFunction__, rssi__, snr__, rate__) \
196 msg__ = (CsrWifiRouterMaPacketInd *) CsrPmemAlloc(sizeof(CsrWifiRouterMaPacketInd)); \ 196 msg__ = kmalloc(sizeof(CsrWifiRouterMaPacketInd), GFP_KERNEL); \
197 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_PRIM, CSR_WIFI_ROUTER_MA_PACKET_IND, dst__, src__); \ 197 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_PRIM, CSR_WIFI_ROUTER_MA_PACKET_IND, dst__, src__); \
198 msg__->interfaceTag = (interfaceTag__); \ 198 msg__->interfaceTag = (interfaceTag__); \
199 msg__->subscriptionHandle = (subscriptionHandle__); \ 199 msg__->subscriptionHandle = (subscriptionHandle__); \
@@ -231,7 +231,7 @@ extern const char *CsrWifiRouterDownstreamPrimNames[CSR_WIFI_ROUTER_PRIM_DOWNSTR
231 231
232*******************************************************************************/ 232*******************************************************************************/
233#define CsrWifiRouterMaPacketResCreate(msg__, dst__, src__, interfaceTag__, subscriptionHandle__, result__) \ 233#define CsrWifiRouterMaPacketResCreate(msg__, dst__, src__, interfaceTag__, subscriptionHandle__, result__) \
234 msg__ = (CsrWifiRouterMaPacketRes *) CsrPmemAlloc(sizeof(CsrWifiRouterMaPacketRes)); \ 234 msg__ = kmalloc(sizeof(CsrWifiRouterMaPacketRes), GFP_KERNEL); \
235 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_PRIM, CSR_WIFI_ROUTER_MA_PACKET_RES, dst__, src__); \ 235 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_PRIM, CSR_WIFI_ROUTER_MA_PACKET_RES, dst__, src__); \
236 msg__->interfaceTag = (interfaceTag__); \ 236 msg__->interfaceTag = (interfaceTag__); \
237 msg__->subscriptionHandle = (subscriptionHandle__); \ 237 msg__->subscriptionHandle = (subscriptionHandle__); \
@@ -265,7 +265,7 @@ extern const char *CsrWifiRouterDownstreamPrimNames[CSR_WIFI_ROUTER_PRIM_DOWNSTR
265 265
266*******************************************************************************/ 266*******************************************************************************/
267#define CsrWifiRouterMaPacketCfmCreate(msg__, dst__, src__, interfaceTag__, result__, hostTag__, rate__) \ 267#define CsrWifiRouterMaPacketCfmCreate(msg__, dst__, src__, interfaceTag__, result__, hostTag__, rate__) \
268 msg__ = (CsrWifiRouterMaPacketCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterMaPacketCfm)); \ 268 msg__ = kmalloc(sizeof(CsrWifiRouterMaPacketCfm), GFP_KERNEL); \
269 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_PRIM, CSR_WIFI_ROUTER_MA_PACKET_CFM, dst__, src__); \ 269 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_PRIM, CSR_WIFI_ROUTER_MA_PACKET_CFM, dst__, src__); \
270 msg__->interfaceTag = (interfaceTag__); \ 270 msg__->interfaceTag = (interfaceTag__); \
271 msg__->result = (result__); \ 271 msg__->result = (result__); \
@@ -306,7 +306,7 @@ extern const char *CsrWifiRouterDownstreamPrimNames[CSR_WIFI_ROUTER_PRIM_DOWNSTR
306 306
307*******************************************************************************/ 307*******************************************************************************/
308#define CsrWifiRouterMaPacketSubscribeReqCreate(msg__, dst__, src__, interfaceTag__, encapsulation__, protocol__, oui__) \ 308#define CsrWifiRouterMaPacketSubscribeReqCreate(msg__, dst__, src__, interfaceTag__, encapsulation__, protocol__, oui__) \
309 msg__ = (CsrWifiRouterMaPacketSubscribeReq *) CsrPmemAlloc(sizeof(CsrWifiRouterMaPacketSubscribeReq)); \ 309 msg__ = kmalloc(sizeof(CsrWifiRouterMaPacketSubscribeReq), GFP_KERNEL); \
310 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_PRIM, CSR_WIFI_ROUTER_MA_PACKET_SUBSCRIBE_REQ, dst__, src__); \ 310 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_PRIM, CSR_WIFI_ROUTER_MA_PACKET_SUBSCRIBE_REQ, dst__, src__); \
311 msg__->interfaceTag = (interfaceTag__); \ 311 msg__->interfaceTag = (interfaceTag__); \
312 msg__->encapsulation = (encapsulation__); \ 312 msg__->encapsulation = (encapsulation__); \
@@ -342,7 +342,7 @@ extern const char *CsrWifiRouterDownstreamPrimNames[CSR_WIFI_ROUTER_PRIM_DOWNSTR
342 342
343*******************************************************************************/ 343*******************************************************************************/
344#define CsrWifiRouterMaPacketSubscribeCfmCreate(msg__, dst__, src__, interfaceTag__, subscriptionHandle__, status__, allocOffset__) \ 344#define CsrWifiRouterMaPacketSubscribeCfmCreate(msg__, dst__, src__, interfaceTag__, subscriptionHandle__, status__, allocOffset__) \
345 msg__ = (CsrWifiRouterMaPacketSubscribeCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterMaPacketSubscribeCfm)); \ 345 msg__ = kmalloc(sizeof(CsrWifiRouterMaPacketSubscribeCfm), GFP_KERNEL); \
346 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_PRIM, CSR_WIFI_ROUTER_MA_PACKET_SUBSCRIBE_CFM, dst__, src__); \ 346 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_PRIM, CSR_WIFI_ROUTER_MA_PACKET_SUBSCRIBE_CFM, dst__, src__); \
347 msg__->interfaceTag = (interfaceTag__); \ 347 msg__->interfaceTag = (interfaceTag__); \
348 msg__->subscriptionHandle = (subscriptionHandle__); \ 348 msg__->subscriptionHandle = (subscriptionHandle__); \
@@ -374,7 +374,7 @@ extern const char *CsrWifiRouterDownstreamPrimNames[CSR_WIFI_ROUTER_PRIM_DOWNSTR
374 374
375*******************************************************************************/ 375*******************************************************************************/
376#define CsrWifiRouterMaPacketUnsubscribeReqCreate(msg__, dst__, src__, interfaceTag__, subscriptionHandle__) \ 376#define CsrWifiRouterMaPacketUnsubscribeReqCreate(msg__, dst__, src__, interfaceTag__, subscriptionHandle__) \
377 msg__ = (CsrWifiRouterMaPacketUnsubscribeReq *) CsrPmemAlloc(sizeof(CsrWifiRouterMaPacketUnsubscribeReq)); \ 377 msg__ = kmalloc(sizeof(CsrWifiRouterMaPacketUnsubscribeReq), GFP_KERNEL); \
378 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_PRIM, CSR_WIFI_ROUTER_MA_PACKET_UNSUBSCRIBE_REQ, dst__, src__); \ 378 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_PRIM, CSR_WIFI_ROUTER_MA_PACKET_UNSUBSCRIBE_REQ, dst__, src__); \
379 msg__->interfaceTag = (interfaceTag__); \ 379 msg__->interfaceTag = (interfaceTag__); \
380 msg__->subscriptionHandle = (subscriptionHandle__); 380 msg__->subscriptionHandle = (subscriptionHandle__);
@@ -405,7 +405,7 @@ extern const char *CsrWifiRouterDownstreamPrimNames[CSR_WIFI_ROUTER_PRIM_DOWNSTR
405 405
406*******************************************************************************/ 406*******************************************************************************/
407#define CsrWifiRouterMaPacketUnsubscribeCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \ 407#define CsrWifiRouterMaPacketUnsubscribeCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \
408 msg__ = (CsrWifiRouterMaPacketUnsubscribeCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterMaPacketUnsubscribeCfm)); \ 408 msg__ = kmalloc(sizeof(CsrWifiRouterMaPacketUnsubscribeCfm), GFP_KERNEL); \
409 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_PRIM, CSR_WIFI_ROUTER_MA_PACKET_UNSUBSCRIBE_CFM, dst__, src__); \ 409 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_ROUTER_PRIM, CSR_WIFI_ROUTER_MA_PACKET_UNSUBSCRIBE_CFM, dst__, src__); \
410 msg__->interfaceTag = (interfaceTag__); \ 410 msg__->interfaceTag = (interfaceTag__); \
411 msg__->status = (status__); 411 msg__->status = (status__);
diff --git a/drivers/staging/csr/csr_wifi_router_serialize.c b/drivers/staging/csr/csr_wifi_router_serialize.c
index dd2c2cee5de1..adf37d472d20 100644
--- a/drivers/staging/csr/csr_wifi_router_serialize.c
+++ b/drivers/staging/csr/csr_wifi_router_serialize.c
@@ -52,7 +52,7 @@ u8* CsrWifiRouterMaPacketSubscribeReqSer(u8 *ptr, size_t *len, void *msg)
52 52
53void* CsrWifiRouterMaPacketSubscribeReqDes(u8 *buffer, size_t length) 53void* CsrWifiRouterMaPacketSubscribeReqDes(u8 *buffer, size_t length)
54{ 54{
55 CsrWifiRouterMaPacketSubscribeReq *primitive = (CsrWifiRouterMaPacketSubscribeReq *) CsrPmemAlloc(sizeof(CsrWifiRouterMaPacketSubscribeReq)); 55 CsrWifiRouterMaPacketSubscribeReq *primitive = kmalloc(sizeof(CsrWifiRouterMaPacketSubscribeReq), GFP_KERNEL);
56 size_t offset; 56 size_t offset;
57 offset = 0; 57 offset = 0;
58 58
@@ -106,7 +106,7 @@ u8* CsrWifiRouterMaPacketReqSer(u8 *ptr, size_t *len, void *msg)
106 106
107void* CsrWifiRouterMaPacketReqDes(u8 *buffer, size_t length) 107void* CsrWifiRouterMaPacketReqDes(u8 *buffer, size_t length)
108{ 108{
109 CsrWifiRouterMaPacketReq *primitive = (CsrWifiRouterMaPacketReq *) CsrPmemAlloc(sizeof(CsrWifiRouterMaPacketReq)); 109 CsrWifiRouterMaPacketReq *primitive = kmalloc(sizeof(CsrWifiRouterMaPacketReq), GFP_KERNEL);
110 size_t offset; 110 size_t offset;
111 offset = 0; 111 offset = 0;
112 112
@@ -116,7 +116,7 @@ void* CsrWifiRouterMaPacketReqDes(u8 *buffer, size_t length)
116 CsrUint16Des((u16 *) &primitive->frameLength, buffer, &offset); 116 CsrUint16Des((u16 *) &primitive->frameLength, buffer, &offset);
117 if (primitive->frameLength) 117 if (primitive->frameLength)
118 { 118 {
119 primitive->frame = (u8 *)CsrPmemAlloc(primitive->frameLength); 119 primitive->frame = kmalloc(primitive->frameLength, GFP_KERNEL);
120 CsrMemCpyDes(primitive->frame, buffer, &offset, ((u16) (primitive->frameLength))); 120 CsrMemCpyDes(primitive->frame, buffer, &offset, ((u16) (primitive->frameLength)));
121 } 121 }
122 else 122 else
@@ -167,7 +167,7 @@ u8* CsrWifiRouterMaPacketResSer(u8 *ptr, size_t *len, void *msg)
167 167
168void* CsrWifiRouterMaPacketResDes(u8 *buffer, size_t length) 168void* CsrWifiRouterMaPacketResDes(u8 *buffer, size_t length)
169{ 169{
170 CsrWifiRouterMaPacketRes *primitive = (CsrWifiRouterMaPacketRes *) CsrPmemAlloc(sizeof(CsrWifiRouterMaPacketRes)); 170 CsrWifiRouterMaPacketRes *primitive = kmalloc(sizeof(CsrWifiRouterMaPacketRes), GFP_KERNEL);
171 size_t offset; 171 size_t offset;
172 offset = 0; 172 offset = 0;
173 173
@@ -208,7 +208,7 @@ u8* CsrWifiRouterMaPacketCancelReqSer(u8 *ptr, size_t *len, void *msg)
208 208
209void* CsrWifiRouterMaPacketCancelReqDes(u8 *buffer, size_t length) 209void* CsrWifiRouterMaPacketCancelReqDes(u8 *buffer, size_t length)
210{ 210{
211 CsrWifiRouterMaPacketCancelReq *primitive = (CsrWifiRouterMaPacketCancelReq *) CsrPmemAlloc(sizeof(CsrWifiRouterMaPacketCancelReq)); 211 CsrWifiRouterMaPacketCancelReq *primitive = kmalloc(sizeof(CsrWifiRouterMaPacketCancelReq), GFP_KERNEL);
212 size_t offset; 212 size_t offset;
213 offset = 0; 213 offset = 0;
214 214
@@ -250,7 +250,7 @@ u8* CsrWifiRouterMaPacketSubscribeCfmSer(u8 *ptr, size_t *len, void *msg)
250 250
251void* CsrWifiRouterMaPacketSubscribeCfmDes(u8 *buffer, size_t length) 251void* CsrWifiRouterMaPacketSubscribeCfmDes(u8 *buffer, size_t length)
252{ 252{
253 CsrWifiRouterMaPacketSubscribeCfm *primitive = (CsrWifiRouterMaPacketSubscribeCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterMaPacketSubscribeCfm)); 253 CsrWifiRouterMaPacketSubscribeCfm *primitive = kmalloc(sizeof(CsrWifiRouterMaPacketSubscribeCfm), GFP_KERNEL);
254 size_t offset; 254 size_t offset;
255 offset = 0; 255 offset = 0;
256 256
@@ -288,7 +288,7 @@ u8* CsrWifiRouterMaPacketUnsubscribeCfmSer(u8 *ptr, size_t *len, void *msg)
288 288
289void* CsrWifiRouterMaPacketUnsubscribeCfmDes(u8 *buffer, size_t length) 289void* CsrWifiRouterMaPacketUnsubscribeCfmDes(u8 *buffer, size_t length)
290{ 290{
291 CsrWifiRouterMaPacketUnsubscribeCfm *primitive = (CsrWifiRouterMaPacketUnsubscribeCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterMaPacketUnsubscribeCfm)); 291 CsrWifiRouterMaPacketUnsubscribeCfm *primitive = kmalloc(sizeof(CsrWifiRouterMaPacketUnsubscribeCfm), GFP_KERNEL);
292 size_t offset; 292 size_t offset;
293 offset = 0; 293 offset = 0;
294 294
@@ -328,7 +328,7 @@ u8* CsrWifiRouterMaPacketCfmSer(u8 *ptr, size_t *len, void *msg)
328 328
329void* CsrWifiRouterMaPacketCfmDes(u8 *buffer, size_t length) 329void* CsrWifiRouterMaPacketCfmDes(u8 *buffer, size_t length)
330{ 330{
331 CsrWifiRouterMaPacketCfm *primitive = (CsrWifiRouterMaPacketCfm *) CsrPmemAlloc(sizeof(CsrWifiRouterMaPacketCfm)); 331 CsrWifiRouterMaPacketCfm *primitive = kmalloc(sizeof(CsrWifiRouterMaPacketCfm), GFP_KERNEL);
332 size_t offset; 332 size_t offset;
333 offset = 0; 333 offset = 0;
334 334
@@ -384,7 +384,7 @@ u8* CsrWifiRouterMaPacketIndSer(u8 *ptr, size_t *len, void *msg)
384 384
385void* CsrWifiRouterMaPacketIndDes(u8 *buffer, size_t length) 385void* CsrWifiRouterMaPacketIndDes(u8 *buffer, size_t length)
386{ 386{
387 CsrWifiRouterMaPacketInd *primitive = (CsrWifiRouterMaPacketInd *) CsrPmemAlloc(sizeof(CsrWifiRouterMaPacketInd)); 387 CsrWifiRouterMaPacketInd *primitive = kmalloc(sizeof(CsrWifiRouterMaPacketInd), GFP_KERNEL);
388 size_t offset; 388 size_t offset;
389 offset = 0; 389 offset = 0;
390 390
@@ -395,7 +395,7 @@ void* CsrWifiRouterMaPacketIndDes(u8 *buffer, size_t length)
395 CsrUint16Des((u16 *) &primitive->frameLength, buffer, &offset); 395 CsrUint16Des((u16 *) &primitive->frameLength, buffer, &offset);
396 if (primitive->frameLength) 396 if (primitive->frameLength)
397 { 397 {
398 primitive->frame = (u8 *)CsrPmemAlloc(primitive->frameLength); 398 primitive->frame = kmalloc(primitive->frameLength, GFP_KERNEL);
399 CsrMemCpyDes(primitive->frame, buffer, &offset, ((u16) (primitive->frameLength))); 399 CsrMemCpyDes(primitive->frame, buffer, &offset, ((u16) (primitive->frameLength)));
400 } 400 }
401 else 401 else
diff --git a/drivers/staging/csr/csr_wifi_router_transport.c b/drivers/staging/csr/csr_wifi_router_transport.c
index 5d86aa88a40d..4bff43547143 100644
--- a/drivers/staging/csr/csr_wifi_router_transport.c
+++ b/drivers/staging/csr/csr_wifi_router_transport.c
@@ -180,7 +180,7 @@ static void CsrWifiRouterTransportSerialiseAndSend(u16 primType, void* msg)
180 180
181 msgSize = 6 + (msgEntry->sizeofFunc)((void*)msg); 181 msgSize = 6 + (msgEntry->sizeofFunc)((void*)msg);
182 182
183 encodeBuffer = CsrPmemAlloc(msgSize); 183 encodeBuffer = kmalloc(msgSize, GFP_KERNEL);
184 184
185 /* Encode PrimType */ 185 /* Encode PrimType */
186 CsrUint16Ser(encodeBuffer, &encodeBufferLen, primType); 186 CsrUint16Ser(encodeBuffer, &encodeBufferLen, primType);
diff --git a/drivers/staging/csr/csr_wifi_serialize_primitive_types.c b/drivers/staging/csr/csr_wifi_serialize_primitive_types.c
index 661d32016136..23b0e5154a0c 100644
--- a/drivers/staging/csr/csr_wifi_serialize_primitive_types.c
+++ b/drivers/staging/csr/csr_wifi_serialize_primitive_types.c
@@ -9,6 +9,7 @@
9*****************************************************************************/ 9*****************************************************************************/
10 10
11#include <linux/module.h> 11#include <linux/module.h>
12#include <linux/slab.h>
12#include "csr_pmem.h" 13#include "csr_pmem.h"
13#include "csr_macro.h" 14#include "csr_macro.h"
14#include "csr_msgconv.h" 15#include "csr_msgconv.h"
@@ -125,7 +126,7 @@ EXPORT_SYMBOL_GPL(CsrWifiEventSer);
125 126
126void* CsrWifiEventDes(u8 *buffer, size_t length) 127void* CsrWifiEventDes(u8 *buffer, size_t length)
127{ 128{
128 CsrWifiFsmEvent *primitive = (CsrWifiFsmEvent *) CsrPmemAlloc(sizeof(CsrWifiFsmEvent)); 129 CsrWifiFsmEvent *primitive = kmalloc(sizeof(CsrWifiFsmEvent), GFP_KERNEL);
129 size_t offset = 0; 130 size_t offset = 0;
130 CsrUint16Des(&primitive->type, buffer, &offset); 131 CsrUint16Des(&primitive->type, buffer, &offset);
131 132
@@ -152,7 +153,7 @@ EXPORT_SYMBOL_GPL(CsrWifiEventCsrUint8Ser);
152 153
153void* CsrWifiEventCsrUint8Des(u8 *buffer, size_t length) 154void* CsrWifiEventCsrUint8Des(u8 *buffer, size_t length)
154{ 155{
155 CsrWifiEventCsrUint8 *primitive = (CsrWifiEventCsrUint8 *) CsrPmemAlloc(sizeof(CsrWifiEventCsrUint8)); 156 CsrWifiEventCsrUint8 *primitive = kmalloc(sizeof(CsrWifiEventCsrUint8), GFP_KERNEL);
156 157
157 size_t offset = 0; 158 size_t offset = 0;
158 CsrUint16Des(&primitive->common.type, buffer, &offset); 159 CsrUint16Des(&primitive->common.type, buffer, &offset);
@@ -182,7 +183,7 @@ EXPORT_SYMBOL_GPL(CsrWifiEventCsrUint16Ser);
182 183
183void* CsrWifiEventCsrUint16Des(u8 *buffer, size_t length) 184void* CsrWifiEventCsrUint16Des(u8 *buffer, size_t length)
184{ 185{
185 CsrWifiEventCsrUint16 *primitive = (CsrWifiEventCsrUint16 *) CsrPmemAlloc(sizeof(CsrWifiEventCsrUint16)); 186 CsrWifiEventCsrUint16 *primitive = kmalloc(sizeof(CsrWifiEventCsrUint16), GFP_KERNEL);
186 187
187 size_t offset = 0; 188 size_t offset = 0;
188 CsrUint16Des(&primitive->common.type, buffer, &offset); 189 CsrUint16Des(&primitive->common.type, buffer, &offset);
@@ -212,7 +213,7 @@ EXPORT_SYMBOL_GPL(CsrWifiEventCsrUint32Ser);
212 213
213void* CsrWifiEventCsrUint32Des(u8 *buffer, size_t length) 214void* CsrWifiEventCsrUint32Des(u8 *buffer, size_t length)
214{ 215{
215 CsrWifiEventCsrUint32 *primitive = (CsrWifiEventCsrUint32 *) CsrPmemAlloc(sizeof(CsrWifiEventCsrUint32)); 216 CsrWifiEventCsrUint32 *primitive = kmalloc(sizeof(CsrWifiEventCsrUint32), GFP_KERNEL);
216 217
217 size_t offset = 0; 218 size_t offset = 0;
218 CsrUint16Des(&primitive->common.type, buffer, &offset); 219 CsrUint16Des(&primitive->common.type, buffer, &offset);
@@ -242,7 +243,7 @@ EXPORT_SYMBOL_GPL(CsrWifiEventCsrUint16CsrUint8Ser);
242 243
243void* CsrWifiEventCsrUint16CsrUint8Des(u8 *buffer, size_t length) 244void* CsrWifiEventCsrUint16CsrUint8Des(u8 *buffer, size_t length)
244{ 245{
245 CsrWifiEventCsrUint16CsrUint8 *primitive = (CsrWifiEventCsrUint16CsrUint8 *) CsrPmemAlloc(sizeof(CsrWifiEventCsrUint16CsrUint8)); 246 CsrWifiEventCsrUint16CsrUint8 *primitive = kmalloc(sizeof(CsrWifiEventCsrUint16CsrUint8), GFP_KERNEL);
246 247
247 size_t offset = 0; 248 size_t offset = 0;
248 CsrUint16Des(&primitive->common.type, buffer, &offset); 249 CsrUint16Des(&primitive->common.type, buffer, &offset);
diff --git a/drivers/staging/csr/csr_wifi_sme_ap_lib.h b/drivers/staging/csr/csr_wifi_sme_ap_lib.h
index 8834a3b8a6c0..8825172724a8 100644
--- a/drivers/staging/csr/csr_wifi_sme_ap_lib.h
+++ b/drivers/staging/csr/csr_wifi_sme_ap_lib.h
@@ -94,7 +94,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE
94 94
95*******************************************************************************/ 95*******************************************************************************/
96#define CsrWifiSmeApActiveBaGetReqCreate(msg__, dst__, src__, interfaceTag__) \ 96#define CsrWifiSmeApActiveBaGetReqCreate(msg__, dst__, src__, interfaceTag__) \
97 msg__ = (CsrWifiSmeApActiveBaGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeApActiveBaGetReq)); \ 97 msg__ = kmalloc(sizeof(CsrWifiSmeApActiveBaGetReq), GFP_KERNEL); \
98 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_ACTIVE_BA_GET_REQ, dst__, src__); \ 98 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_ACTIVE_BA_GET_REQ, dst__, src__); \
99 msg__->interfaceTag = (interfaceTag__); 99 msg__->interfaceTag = (interfaceTag__);
100 100
@@ -126,7 +126,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE
126 126
127*******************************************************************************/ 127*******************************************************************************/
128#define CsrWifiSmeApActiveBaGetCfmCreate(msg__, dst__, src__, interfaceTag__, status__, activeBaCount__, activeBaSessions__) \ 128#define CsrWifiSmeApActiveBaGetCfmCreate(msg__, dst__, src__, interfaceTag__, status__, activeBaCount__, activeBaSessions__) \
129 msg__ = (CsrWifiSmeApActiveBaGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeApActiveBaGetCfm)); \ 129 msg__ = kmalloc(sizeof(CsrWifiSmeApActiveBaGetCfm), GFP_KERNEL); \
130 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_ACTIVE_BA_GET_CFM, dst__, src__); \ 130 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_ACTIVE_BA_GET_CFM, dst__, src__); \
131 msg__->interfaceTag = (interfaceTag__); \ 131 msg__->interfaceTag = (interfaceTag__); \
132 msg__->status = (status__); \ 132 msg__->status = (status__); \
@@ -159,7 +159,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE
159 159
160*******************************************************************************/ 160*******************************************************************************/
161#define CsrWifiSmeApBaDeleteReqCreate(msg__, dst__, src__, interfaceTag__, reason__, baSession__) \ 161#define CsrWifiSmeApBaDeleteReqCreate(msg__, dst__, src__, interfaceTag__, reason__, baSession__) \
162 msg__ = (CsrWifiSmeApBaDeleteReq *) CsrPmemAlloc(sizeof(CsrWifiSmeApBaDeleteReq)); \ 162 msg__ = kmalloc(sizeof(CsrWifiSmeApBaDeleteReq), GFP_KERNEL); \
163 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_BA_DELETE_REQ, dst__, src__); \ 163 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_BA_DELETE_REQ, dst__, src__); \
164 msg__->interfaceTag = (interfaceTag__); \ 164 msg__->interfaceTag = (interfaceTag__); \
165 msg__->reason = (reason__); \ 165 msg__->reason = (reason__); \
@@ -191,7 +191,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE
191 191
192*******************************************************************************/ 192*******************************************************************************/
193#define CsrWifiSmeApBaDeleteCfmCreate(msg__, dst__, src__, interfaceTag__, status__, baSession__) \ 193#define CsrWifiSmeApBaDeleteCfmCreate(msg__, dst__, src__, interfaceTag__, status__, baSession__) \
194 msg__ = (CsrWifiSmeApBaDeleteCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeApBaDeleteCfm)); \ 194 msg__ = kmalloc(sizeof(CsrWifiSmeApBaDeleteCfm), GFP_KERNEL); \
195 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_BA_DELETE_CFM, dst__, src__); \ 195 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_BA_DELETE_CFM, dst__, src__); \
196 msg__->interfaceTag = (interfaceTag__); \ 196 msg__->interfaceTag = (interfaceTag__); \
197 msg__->status = (status__); \ 197 msg__->status = (status__); \
@@ -233,7 +233,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE
233 233
234*******************************************************************************/ 234*******************************************************************************/
235#define CsrWifiSmeApBeaconingStartReqCreate(msg__, dst__, src__, interfaceTag__, initialPresence__, apType__, cloakSsid__, ssid__, ifIndex__, channel__, maxConnections__, apCredentials__, smeApConfig__, p2pGoParam__) \ 235#define CsrWifiSmeApBeaconingStartReqCreate(msg__, dst__, src__, interfaceTag__, initialPresence__, apType__, cloakSsid__, ssid__, ifIndex__, channel__, maxConnections__, apCredentials__, smeApConfig__, p2pGoParam__) \
236 msg__ = (CsrWifiSmeApBeaconingStartReq *) CsrPmemAlloc(sizeof(CsrWifiSmeApBeaconingStartReq)); \ 236 msg__ = kmalloc(sizeof(CsrWifiSmeApBeaconingStartReq), GFP_KERNEL); \
237 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_BEACONING_START_REQ, dst__, src__); \ 237 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_BEACONING_START_REQ, dst__, src__); \
238 msg__->interfaceTag = (interfaceTag__); \ 238 msg__->interfaceTag = (interfaceTag__); \
239 msg__->initialPresence = (initialPresence__); \ 239 msg__->initialPresence = (initialPresence__); \
@@ -275,7 +275,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE
275 275
276*******************************************************************************/ 276*******************************************************************************/
277#define CsrWifiSmeApBeaconingStartCfmCreate(msg__, dst__, src__, interfaceTag__, status__, secIeLength__, secIe__) \ 277#define CsrWifiSmeApBeaconingStartCfmCreate(msg__, dst__, src__, interfaceTag__, status__, secIeLength__, secIe__) \
278 msg__ = (CsrWifiSmeApBeaconingStartCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeApBeaconingStartCfm)); \ 278 msg__ = kmalloc(sizeof(CsrWifiSmeApBeaconingStartCfm), GFP_KERNEL); \
279 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_BEACONING_START_CFM, dst__, src__); \ 279 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_BEACONING_START_CFM, dst__, src__); \
280 msg__->interfaceTag = (interfaceTag__); \ 280 msg__->interfaceTag = (interfaceTag__); \
281 msg__->status = (status__); \ 281 msg__->status = (status__); \
@@ -306,7 +306,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE
306 306
307*******************************************************************************/ 307*******************************************************************************/
308#define CsrWifiSmeApBeaconingStopReqCreate(msg__, dst__, src__, interfaceTag__) \ 308#define CsrWifiSmeApBeaconingStopReqCreate(msg__, dst__, src__, interfaceTag__) \
309 msg__ = (CsrWifiSmeApBeaconingStopReq *) CsrPmemAlloc(sizeof(CsrWifiSmeApBeaconingStopReq)); \ 309 msg__ = kmalloc(sizeof(CsrWifiSmeApBeaconingStopReq), GFP_KERNEL); \
310 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_BEACONING_STOP_REQ, dst__, src__); \ 310 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_BEACONING_STOP_REQ, dst__, src__); \
311 msg__->interfaceTag = (interfaceTag__); 311 msg__->interfaceTag = (interfaceTag__);
312 312
@@ -335,7 +335,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE
335 335
336*******************************************************************************/ 336*******************************************************************************/
337#define CsrWifiSmeApBeaconingStopCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \ 337#define CsrWifiSmeApBeaconingStopCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \
338 msg__ = (CsrWifiSmeApBeaconingStopCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeApBeaconingStopCfm)); \ 338 msg__ = kmalloc(sizeof(CsrWifiSmeApBeaconingStopCfm), GFP_KERNEL); \
339 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_BEACONING_STOP_CFM, dst__, src__); \ 339 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_BEACONING_STOP_CFM, dst__, src__); \
340 msg__->interfaceTag = (interfaceTag__); \ 340 msg__->interfaceTag = (interfaceTag__); \
341 msg__->status = (status__); 341 msg__->status = (status__);
@@ -369,7 +369,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE
369 369
370*******************************************************************************/ 370*******************************************************************************/
371#define CsrWifiSmeApErrorIndCreate(msg__, dst__, src__, interfaceTag__, apType__, status__) \ 371#define CsrWifiSmeApErrorIndCreate(msg__, dst__, src__, interfaceTag__, apType__, status__) \
372 msg__ = (CsrWifiSmeApErrorInd *) CsrPmemAlloc(sizeof(CsrWifiSmeApErrorInd)); \ 372 msg__ = kmalloc(sizeof(CsrWifiSmeApErrorInd), GFP_KERNEL); \
373 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_ERROR_IND, dst__, src__); \ 373 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_ERROR_IND, dst__, src__); \
374 msg__->interfaceTag = (interfaceTag__); \ 374 msg__->interfaceTag = (interfaceTag__); \
375 msg__->apType = (apType__); \ 375 msg__->apType = (apType__); \
@@ -401,7 +401,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE
401 401
402*******************************************************************************/ 402*******************************************************************************/
403#define CsrWifiSmeApStaConnectStartIndCreate(msg__, dst__, src__, interfaceTag__, peerMacAddress__) \ 403#define CsrWifiSmeApStaConnectStartIndCreate(msg__, dst__, src__, interfaceTag__, peerMacAddress__) \
404 msg__ = (CsrWifiSmeApStaConnectStartInd *) CsrPmemAlloc(sizeof(CsrWifiSmeApStaConnectStartInd)); \ 404 msg__ = kmalloc(sizeof(CsrWifiSmeApStaConnectStartInd), GFP_KERNEL); \
405 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_STA_CONNECT_START_IND, dst__, src__); \ 405 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_STA_CONNECT_START_IND, dst__, src__); \
406 msg__->interfaceTag = (interfaceTag__); \ 406 msg__->interfaceTag = (interfaceTag__); \
407 msg__->peerMacAddress = (peerMacAddress__); 407 msg__->peerMacAddress = (peerMacAddress__);
@@ -437,7 +437,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE
437 437
438*******************************************************************************/ 438*******************************************************************************/
439#define CsrWifiSmeApStaDisconnectReqCreate(msg__, dst__, src__, interfaceTag__, deauthReason__, disassocReason__, peerMacaddress__, keepBlocking__) \ 439#define CsrWifiSmeApStaDisconnectReqCreate(msg__, dst__, src__, interfaceTag__, deauthReason__, disassocReason__, peerMacaddress__, keepBlocking__) \
440 msg__ = (CsrWifiSmeApStaDisconnectReq *) CsrPmemAlloc(sizeof(CsrWifiSmeApStaDisconnectReq)); \ 440 msg__ = kmalloc(sizeof(CsrWifiSmeApStaDisconnectReq), GFP_KERNEL); \
441 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_STA_DISCONNECT_REQ, dst__, src__); \ 441 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_STA_DISCONNECT_REQ, dst__, src__); \
442 msg__->interfaceTag = (interfaceTag__); \ 442 msg__->interfaceTag = (interfaceTag__); \
443 msg__->deauthReason = (deauthReason__); \ 443 msg__->deauthReason = (deauthReason__); \
@@ -471,7 +471,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE
471 471
472*******************************************************************************/ 472*******************************************************************************/
473#define CsrWifiSmeApStaDisconnectCfmCreate(msg__, dst__, src__, interfaceTag__, status__, peerMacaddress__) \ 473#define CsrWifiSmeApStaDisconnectCfmCreate(msg__, dst__, src__, interfaceTag__, status__, peerMacaddress__) \
474 msg__ = (CsrWifiSmeApStaDisconnectCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeApStaDisconnectCfm)); \ 474 msg__ = kmalloc(sizeof(CsrWifiSmeApStaDisconnectCfm), GFP_KERNEL); \
475 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_STA_DISCONNECT_CFM, dst__, src__); \ 475 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_STA_DISCONNECT_CFM, dst__, src__); \
476 msg__->interfaceTag = (interfaceTag__); \ 476 msg__->interfaceTag = (interfaceTag__); \
477 msg__->status = (status__); \ 477 msg__->status = (status__); \
@@ -512,7 +512,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE
512 512
513*******************************************************************************/ 513*******************************************************************************/
514#define CsrWifiSmeApStaNotifyIndCreate(msg__, dst__, src__, interfaceTag__, mediaStatus__, peerMacAddress__, peerDeviceAddress__, disassocReason__, deauthReason__, WpsRegistration__, secIeLength__, secIe__, groupKeyId__, seqNumber__) \ 514#define CsrWifiSmeApStaNotifyIndCreate(msg__, dst__, src__, interfaceTag__, mediaStatus__, peerMacAddress__, peerDeviceAddress__, disassocReason__, deauthReason__, WpsRegistration__, secIeLength__, secIe__, groupKeyId__, seqNumber__) \
515 msg__ = (CsrWifiSmeApStaNotifyInd *) CsrPmemAlloc(sizeof(CsrWifiSmeApStaNotifyInd)); \ 515 msg__ = kmalloc(sizeof(CsrWifiSmeApStaNotifyInd), GFP_KERNEL); \
516 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_STA_NOTIFY_IND, dst__, src__); \ 516 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_STA_NOTIFY_IND, dst__, src__); \
517 msg__->interfaceTag = (interfaceTag__); \ 517 msg__->interfaceTag = (interfaceTag__); \
518 msg__->mediaStatus = (mediaStatus__); \ 518 msg__->mediaStatus = (mediaStatus__); \
@@ -553,7 +553,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE
553 553
554*******************************************************************************/ 554*******************************************************************************/
555#define CsrWifiSmeApWmmParamUpdateReqCreate(msg__, dst__, src__, interfaceTag__, wmmApParams__, wmmApBcParams__) \ 555#define CsrWifiSmeApWmmParamUpdateReqCreate(msg__, dst__, src__, interfaceTag__, wmmApParams__, wmmApBcParams__) \
556 msg__ = (CsrWifiSmeApWmmParamUpdateReq *) CsrPmemAlloc(sizeof(CsrWifiSmeApWmmParamUpdateReq)); \ 556 msg__ = kmalloc(sizeof(CsrWifiSmeApWmmParamUpdateReq), GFP_KERNEL); \
557 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_WMM_PARAM_UPDATE_REQ, dst__, src__); \ 557 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_WMM_PARAM_UPDATE_REQ, dst__, src__); \
558 msg__->interfaceTag = (interfaceTag__); \ 558 msg__->interfaceTag = (interfaceTag__); \
559 memcpy(msg__->wmmApParams, (wmmApParams__), sizeof(CsrWifiSmeWmmAcParams) * 4); \ 559 memcpy(msg__->wmmApParams, (wmmApParams__), sizeof(CsrWifiSmeWmmAcParams) * 4); \
@@ -584,7 +584,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE
584 584
585*******************************************************************************/ 585*******************************************************************************/
586#define CsrWifiSmeApWmmParamUpdateCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \ 586#define CsrWifiSmeApWmmParamUpdateCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \
587 msg__ = (CsrWifiSmeApWmmParamUpdateCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeApWmmParamUpdateCfm)); \ 587 msg__ = kmalloc(sizeof(CsrWifiSmeApWmmParamUpdateCfm), GFP_KERNEL); \
588 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_WMM_PARAM_UPDATE_CFM, dst__, src__); \ 588 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_WMM_PARAM_UPDATE_CFM, dst__, src__); \
589 msg__->interfaceTag = (interfaceTag__); \ 589 msg__->interfaceTag = (interfaceTag__); \
590 msg__->status = (status__); 590 msg__->status = (status__);
@@ -614,7 +614,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE
614 614
615*******************************************************************************/ 615*******************************************************************************/
616#define CsrWifiSmeApWpsConfigurationReqCreate(msg__, dst__, src__, wpsConfig__) \ 616#define CsrWifiSmeApWpsConfigurationReqCreate(msg__, dst__, src__, wpsConfig__) \
617 msg__ = (CsrWifiSmeApWpsConfigurationReq *) CsrPmemAlloc(sizeof(CsrWifiSmeApWpsConfigurationReq)); \ 617 msg__ = kmalloc(sizeof(CsrWifiSmeApWpsConfigurationReq), GFP_KERNEL); \
618 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_WPS_CONFIGURATION_REQ, dst__, src__); \ 618 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_WPS_CONFIGURATION_REQ, dst__, src__); \
619 msg__->wpsConfig = (wpsConfig__); 619 msg__->wpsConfig = (wpsConfig__);
620 620
@@ -642,7 +642,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE
642 642
643*******************************************************************************/ 643*******************************************************************************/
644#define CsrWifiSmeApWpsConfigurationCfmCreate(msg__, dst__, src__, status__) \ 644#define CsrWifiSmeApWpsConfigurationCfmCreate(msg__, dst__, src__, status__) \
645 msg__ = (CsrWifiSmeApWpsConfigurationCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeApWpsConfigurationCfm)); \ 645 msg__ = kmalloc(sizeof(CsrWifiSmeApWpsConfigurationCfm), GFP_KERNEL); \
646 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_WPS_CONFIGURATION_CFM, dst__, src__); \ 646 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_WPS_CONFIGURATION_CFM, dst__, src__); \
647 msg__->status = (status__); 647 msg__->status = (status__);
648 648
@@ -670,7 +670,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE
670 670
671*******************************************************************************/ 671*******************************************************************************/
672#define CsrWifiSmeApWpsRegistrationFinishedReqCreate(msg__, dst__, src__, interfaceTag__) \ 672#define CsrWifiSmeApWpsRegistrationFinishedReqCreate(msg__, dst__, src__, interfaceTag__) \
673 msg__ = (CsrWifiSmeApWpsRegistrationFinishedReq *) CsrPmemAlloc(sizeof(CsrWifiSmeApWpsRegistrationFinishedReq)); \ 673 msg__ = kmalloc(sizeof(CsrWifiSmeApWpsRegistrationFinishedReq), GFP_KERNEL); \
674 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_WPS_REGISTRATION_FINISHED_REQ, dst__, src__); \ 674 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_WPS_REGISTRATION_FINISHED_REQ, dst__, src__); \
675 msg__->interfaceTag = (interfaceTag__); 675 msg__->interfaceTag = (interfaceTag__);
676 676
@@ -699,7 +699,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE
699 699
700*******************************************************************************/ 700*******************************************************************************/
701#define CsrWifiSmeApWpsRegistrationFinishedCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \ 701#define CsrWifiSmeApWpsRegistrationFinishedCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \
702 msg__ = (CsrWifiSmeApWpsRegistrationFinishedCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeApWpsRegistrationFinishedCfm)); \ 702 msg__ = kmalloc(sizeof(CsrWifiSmeApWpsRegistrationFinishedCfm), GFP_KERNEL); \
703 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_WPS_REGISTRATION_FINISHED_CFM, dst__, src__); \ 703 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_WPS_REGISTRATION_FINISHED_CFM, dst__, src__); \
704 msg__->interfaceTag = (interfaceTag__); \ 704 msg__->interfaceTag = (interfaceTag__); \
705 msg__->status = (status__); 705 msg__->status = (status__);
@@ -730,7 +730,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE
730 730
731*******************************************************************************/ 731*******************************************************************************/
732#define CsrWifiSmeApWpsRegistrationStartedReqCreate(msg__, dst__, src__, interfaceTag__, SelectedDevicePasswordId__, SelectedconfigMethod__) \ 732#define CsrWifiSmeApWpsRegistrationStartedReqCreate(msg__, dst__, src__, interfaceTag__, SelectedDevicePasswordId__, SelectedconfigMethod__) \
733 msg__ = (CsrWifiSmeApWpsRegistrationStartedReq *) CsrPmemAlloc(sizeof(CsrWifiSmeApWpsRegistrationStartedReq)); \ 733 msg__ = kmalloc(sizeof(CsrWifiSmeApWpsRegistrationStartedReq), GFP_KERNEL); \
734 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_WPS_REGISTRATION_STARTED_REQ, dst__, src__); \ 734 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_WPS_REGISTRATION_STARTED_REQ, dst__, src__); \
735 msg__->interfaceTag = (interfaceTag__); \ 735 msg__->interfaceTag = (interfaceTag__); \
736 msg__->SelectedDevicePasswordId = (SelectedDevicePasswordId__); \ 736 msg__->SelectedDevicePasswordId = (SelectedDevicePasswordId__); \
@@ -761,7 +761,7 @@ extern const char *CsrWifiSmeApDownstreamPrimNames[CSR_WIFI_SME_AP_PRIM_DOWNSTRE
761 761
762*******************************************************************************/ 762*******************************************************************************/
763#define CsrWifiSmeApWpsRegistrationStartedCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \ 763#define CsrWifiSmeApWpsRegistrationStartedCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \
764 msg__ = (CsrWifiSmeApWpsRegistrationStartedCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeApWpsRegistrationStartedCfm)); \ 764 msg__ = kmalloc(sizeof(CsrWifiSmeApWpsRegistrationStartedCfm), GFP_KERNEL); \
765 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_WPS_REGISTRATION_STARTED_CFM, dst__, src__); \ 765 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_AP_PRIM, CSR_WIFI_SME_AP_WPS_REGISTRATION_STARTED_CFM, dst__, src__); \
766 msg__->interfaceTag = (interfaceTag__); \ 766 msg__->interfaceTag = (interfaceTag__); \
767 msg__->status = (status__); 767 msg__->status = (status__);
diff --git a/drivers/staging/csr/csr_wifi_sme_lib.h b/drivers/staging/csr/csr_wifi_sme_lib.h
index 7fa9c2353c70..e20ae9895a2a 100644
--- a/drivers/staging/csr/csr_wifi_sme_lib.h
+++ b/drivers/staging/csr/csr_wifi_sme_lib.h
@@ -137,7 +137,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
137 137
138*******************************************************************************/ 138*******************************************************************************/
139#define CsrWifiSmeActivateReqCreate(msg__, dst__, src__) \ 139#define CsrWifiSmeActivateReqCreate(msg__, dst__, src__) \
140 msg__ = (CsrWifiSmeActivateReq *) CsrPmemAlloc(sizeof(CsrWifiSmeActivateReq)); \ 140 msg__ = kmalloc(sizeof(CsrWifiSmeActivateReq), GFP_KERNEL); \
141 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ACTIVATE_REQ, dst__, src__); 141 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ACTIVATE_REQ, dst__, src__);
142 142
143#define CsrWifiSmeActivateReqSendTo(dst__, src__) \ 143#define CsrWifiSmeActivateReqSendTo(dst__, src__) \
@@ -164,7 +164,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
164 164
165*******************************************************************************/ 165*******************************************************************************/
166#define CsrWifiSmeActivateCfmCreate(msg__, dst__, src__, status__) \ 166#define CsrWifiSmeActivateCfmCreate(msg__, dst__, src__, status__) \
167 msg__ = (CsrWifiSmeActivateCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeActivateCfm)); \ 167 msg__ = kmalloc(sizeof(CsrWifiSmeActivateCfm), GFP_KERNEL); \
168 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ACTIVATE_CFM, dst__, src__); \ 168 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ACTIVATE_CFM, dst__, src__); \
169 msg__->status = (status__); 169 msg__->status = (status__);
170 170
@@ -191,7 +191,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
191 191
192*******************************************************************************/ 192*******************************************************************************/
193#define CsrWifiSmeAdhocConfigGetReqCreate(msg__, dst__, src__) \ 193#define CsrWifiSmeAdhocConfigGetReqCreate(msg__, dst__, src__) \
194 msg__ = (CsrWifiSmeAdhocConfigGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeAdhocConfigGetReq)); \ 194 msg__ = kmalloc(sizeof(CsrWifiSmeAdhocConfigGetReq), GFP_KERNEL); \
195 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ADHOC_CONFIG_GET_REQ, dst__, src__); 195 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ADHOC_CONFIG_GET_REQ, dst__, src__);
196 196
197#define CsrWifiSmeAdhocConfigGetReqSendTo(dst__, src__) \ 197#define CsrWifiSmeAdhocConfigGetReqSendTo(dst__, src__) \
@@ -220,7 +220,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
220 220
221*******************************************************************************/ 221*******************************************************************************/
222#define CsrWifiSmeAdhocConfigGetCfmCreate(msg__, dst__, src__, status__, adHocConfig__) \ 222#define CsrWifiSmeAdhocConfigGetCfmCreate(msg__, dst__, src__, status__, adHocConfig__) \
223 msg__ = (CsrWifiSmeAdhocConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeAdhocConfigGetCfm)); \ 223 msg__ = kmalloc(sizeof(CsrWifiSmeAdhocConfigGetCfm), GFP_KERNEL); \
224 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ADHOC_CONFIG_GET_CFM, dst__, src__); \ 224 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ADHOC_CONFIG_GET_CFM, dst__, src__); \
225 msg__->status = (status__); \ 225 msg__->status = (status__); \
226 msg__->adHocConfig = (adHocConfig__); 226 msg__->adHocConfig = (adHocConfig__);
@@ -249,7 +249,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
249 249
250*******************************************************************************/ 250*******************************************************************************/
251#define CsrWifiSmeAdhocConfigSetReqCreate(msg__, dst__, src__, adHocConfig__) \ 251#define CsrWifiSmeAdhocConfigSetReqCreate(msg__, dst__, src__, adHocConfig__) \
252 msg__ = (CsrWifiSmeAdhocConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeAdhocConfigSetReq)); \ 252 msg__ = kmalloc(sizeof(CsrWifiSmeAdhocConfigSetReq), GFP_KERNEL); \
253 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ADHOC_CONFIG_SET_REQ, dst__, src__); \ 253 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ADHOC_CONFIG_SET_REQ, dst__, src__); \
254 msg__->adHocConfig = (adHocConfig__); 254 msg__->adHocConfig = (adHocConfig__);
255 255
@@ -277,7 +277,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
277 277
278*******************************************************************************/ 278*******************************************************************************/
279#define CsrWifiSmeAdhocConfigSetCfmCreate(msg__, dst__, src__, status__) \ 279#define CsrWifiSmeAdhocConfigSetCfmCreate(msg__, dst__, src__, status__) \
280 msg__ = (CsrWifiSmeAdhocConfigSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeAdhocConfigSetCfm)); \ 280 msg__ = kmalloc(sizeof(CsrWifiSmeAdhocConfigSetCfm), GFP_KERNEL); \
281 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ADHOC_CONFIG_SET_CFM, dst__, src__); \ 281 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ADHOC_CONFIG_SET_CFM, dst__, src__); \
282 msg__->status = (status__); 282 msg__->status = (status__);
283 283
@@ -307,7 +307,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
307 307
308*******************************************************************************/ 308*******************************************************************************/
309#define CsrWifiSmeAmpStatusChangeIndCreate(msg__, dst__, src__, interfaceTag__, ampStatus__) \ 309#define CsrWifiSmeAmpStatusChangeIndCreate(msg__, dst__, src__, interfaceTag__, ampStatus__) \
310 msg__ = (CsrWifiSmeAmpStatusChangeInd *) CsrPmemAlloc(sizeof(CsrWifiSmeAmpStatusChangeInd)); \ 310 msg__ = kmalloc(sizeof(CsrWifiSmeAmpStatusChangeInd), GFP_KERNEL); \
311 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_AMP_STATUS_CHANGE_IND, dst__, src__); \ 311 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_AMP_STATUS_CHANGE_IND, dst__, src__); \
312 msg__->interfaceTag = (interfaceTag__); \ 312 msg__->interfaceTag = (interfaceTag__); \
313 msg__->ampStatus = (ampStatus__); 313 msg__->ampStatus = (ampStatus__);
@@ -348,7 +348,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
348 348
349*******************************************************************************/ 349*******************************************************************************/
350#define CsrWifiSmeAssociationCompleteIndCreate(msg__, dst__, src__, interfaceTag__, status__, connectionInfo__, deauthReason__) \ 350#define CsrWifiSmeAssociationCompleteIndCreate(msg__, dst__, src__, interfaceTag__, status__, connectionInfo__, deauthReason__) \
351 msg__ = (CsrWifiSmeAssociationCompleteInd *) CsrPmemAlloc(sizeof(CsrWifiSmeAssociationCompleteInd)); \ 351 msg__ = kmalloc(sizeof(CsrWifiSmeAssociationCompleteInd), GFP_KERNEL); \
352 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ASSOCIATION_COMPLETE_IND, dst__, src__); \ 352 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ASSOCIATION_COMPLETE_IND, dst__, src__); \
353 msg__->interfaceTag = (interfaceTag__); \ 353 msg__->interfaceTag = (interfaceTag__); \
354 msg__->status = (status__); \ 354 msg__->status = (status__); \
@@ -382,7 +382,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
382 382
383*******************************************************************************/ 383*******************************************************************************/
384#define CsrWifiSmeAssociationStartIndCreate(msg__, dst__, src__, interfaceTag__, address__, ssid__) \ 384#define CsrWifiSmeAssociationStartIndCreate(msg__, dst__, src__, interfaceTag__, address__, ssid__) \
385 msg__ = (CsrWifiSmeAssociationStartInd *) CsrPmemAlloc(sizeof(CsrWifiSmeAssociationStartInd)); \ 385 msg__ = kmalloc(sizeof(CsrWifiSmeAssociationStartInd), GFP_KERNEL); \
386 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ASSOCIATION_START_IND, dst__, src__); \ 386 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ASSOCIATION_START_IND, dst__, src__); \
387 msg__->interfaceTag = (interfaceTag__); \ 387 msg__->interfaceTag = (interfaceTag__); \
388 msg__->address = (address__); \ 388 msg__->address = (address__); \
@@ -425,7 +425,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
425 425
426*******************************************************************************/ 426*******************************************************************************/
427#define CsrWifiSmeBlacklistReqCreate(msg__, dst__, src__, interfaceTag__, action__, setAddressCount__, setAddresses__) \ 427#define CsrWifiSmeBlacklistReqCreate(msg__, dst__, src__, interfaceTag__, action__, setAddressCount__, setAddresses__) \
428 msg__ = (CsrWifiSmeBlacklistReq *) CsrPmemAlloc(sizeof(CsrWifiSmeBlacklistReq)); \ 428 msg__ = kmalloc(sizeof(CsrWifiSmeBlacklistReq), GFP_KERNEL); \
429 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_BLACKLIST_REQ, dst__, src__); \ 429 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_BLACKLIST_REQ, dst__, src__); \
430 msg__->interfaceTag = (interfaceTag__); \ 430 msg__->interfaceTag = (interfaceTag__); \
431 msg__->action = (action__); \ 431 msg__->action = (action__); \
@@ -465,7 +465,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
465 465
466*******************************************************************************/ 466*******************************************************************************/
467#define CsrWifiSmeBlacklistCfmCreate(msg__, dst__, src__, interfaceTag__, status__, action__, getAddressCount__, getAddresses__) \ 467#define CsrWifiSmeBlacklistCfmCreate(msg__, dst__, src__, interfaceTag__, status__, action__, getAddressCount__, getAddresses__) \
468 msg__ = (CsrWifiSmeBlacklistCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeBlacklistCfm)); \ 468 msg__ = kmalloc(sizeof(CsrWifiSmeBlacklistCfm), GFP_KERNEL); \
469 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_BLACKLIST_CFM, dst__, src__); \ 469 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_BLACKLIST_CFM, dst__, src__); \
470 msg__->interfaceTag = (interfaceTag__); \ 470 msg__->interfaceTag = (interfaceTag__); \
471 msg__->status = (status__); \ 471 msg__->status = (status__); \
@@ -496,7 +496,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
496 496
497*******************************************************************************/ 497*******************************************************************************/
498#define CsrWifiSmeCalibrationDataGetReqCreate(msg__, dst__, src__) \ 498#define CsrWifiSmeCalibrationDataGetReqCreate(msg__, dst__, src__) \
499 msg__ = (CsrWifiSmeCalibrationDataGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeCalibrationDataGetReq)); \ 499 msg__ = kmalloc(sizeof(CsrWifiSmeCalibrationDataGetReq), GFP_KERNEL); \
500 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CALIBRATION_DATA_GET_REQ, dst__, src__); 500 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CALIBRATION_DATA_GET_REQ, dst__, src__);
501 501
502#define CsrWifiSmeCalibrationDataGetReqSendTo(dst__, src__) \ 502#define CsrWifiSmeCalibrationDataGetReqSendTo(dst__, src__) \
@@ -527,7 +527,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
527 527
528*******************************************************************************/ 528*******************************************************************************/
529#define CsrWifiSmeCalibrationDataGetCfmCreate(msg__, dst__, src__, status__, calibrationDataLength__, calibrationData__) \ 529#define CsrWifiSmeCalibrationDataGetCfmCreate(msg__, dst__, src__, status__, calibrationDataLength__, calibrationData__) \
530 msg__ = (CsrWifiSmeCalibrationDataGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeCalibrationDataGetCfm)); \ 530 msg__ = kmalloc(sizeof(CsrWifiSmeCalibrationDataGetCfm), GFP_KERNEL); \
531 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CALIBRATION_DATA_GET_CFM, dst__, src__); \ 531 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CALIBRATION_DATA_GET_CFM, dst__, src__); \
532 msg__->status = (status__); \ 532 msg__->status = (status__); \
533 msg__->calibrationDataLength = (calibrationDataLength__); \ 533 msg__->calibrationDataLength = (calibrationDataLength__); \
@@ -562,7 +562,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
562 562
563*******************************************************************************/ 563*******************************************************************************/
564#define CsrWifiSmeCalibrationDataSetReqCreate(msg__, dst__, src__, calibrationDataLength__, calibrationData__) \ 564#define CsrWifiSmeCalibrationDataSetReqCreate(msg__, dst__, src__, calibrationDataLength__, calibrationData__) \
565 msg__ = (CsrWifiSmeCalibrationDataSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeCalibrationDataSetReq)); \ 565 msg__ = kmalloc(sizeof(CsrWifiSmeCalibrationDataSetReq), GFP_KERNEL); \
566 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CALIBRATION_DATA_SET_REQ, dst__, src__); \ 566 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CALIBRATION_DATA_SET_REQ, dst__, src__); \
567 msg__->calibrationDataLength = (calibrationDataLength__); \ 567 msg__->calibrationDataLength = (calibrationDataLength__); \
568 msg__->calibrationData = (calibrationData__); 568 msg__->calibrationData = (calibrationData__);
@@ -591,7 +591,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
591 591
592*******************************************************************************/ 592*******************************************************************************/
593#define CsrWifiSmeCalibrationDataSetCfmCreate(msg__, dst__, src__, status__) \ 593#define CsrWifiSmeCalibrationDataSetCfmCreate(msg__, dst__, src__, status__) \
594 msg__ = (CsrWifiSmeCalibrationDataSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeCalibrationDataSetCfm)); \ 594 msg__ = kmalloc(sizeof(CsrWifiSmeCalibrationDataSetCfm), GFP_KERNEL); \
595 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CALIBRATION_DATA_SET_CFM, dst__, src__); \ 595 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CALIBRATION_DATA_SET_CFM, dst__, src__); \
596 msg__->status = (status__); 596 msg__->status = (status__);
597 597
@@ -620,7 +620,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
620 620
621*******************************************************************************/ 621*******************************************************************************/
622#define CsrWifiSmeCcxConfigGetReqCreate(msg__, dst__, src__, interfaceTag__) \ 622#define CsrWifiSmeCcxConfigGetReqCreate(msg__, dst__, src__, interfaceTag__) \
623 msg__ = (CsrWifiSmeCcxConfigGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeCcxConfigGetReq)); \ 623 msg__ = kmalloc(sizeof(CsrWifiSmeCcxConfigGetReq), GFP_KERNEL); \
624 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CCX_CONFIG_GET_REQ, dst__, src__); \ 624 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CCX_CONFIG_GET_REQ, dst__, src__); \
625 msg__->interfaceTag = (interfaceTag__); 625 msg__->interfaceTag = (interfaceTag__);
626 626
@@ -650,7 +650,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
650 650
651*******************************************************************************/ 651*******************************************************************************/
652#define CsrWifiSmeCcxConfigGetCfmCreate(msg__, dst__, src__, interfaceTag__, status__, ccxConfig__) \ 652#define CsrWifiSmeCcxConfigGetCfmCreate(msg__, dst__, src__, interfaceTag__, status__, ccxConfig__) \
653 msg__ = (CsrWifiSmeCcxConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeCcxConfigGetCfm)); \ 653 msg__ = kmalloc(sizeof(CsrWifiSmeCcxConfigGetCfm), GFP_KERNEL); \
654 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CCX_CONFIG_GET_CFM, dst__, src__); \ 654 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CCX_CONFIG_GET_CFM, dst__, src__); \
655 msg__->interfaceTag = (interfaceTag__); \ 655 msg__->interfaceTag = (interfaceTag__); \
656 msg__->status = (status__); \ 656 msg__->status = (status__); \
@@ -682,7 +682,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
682 682
683*******************************************************************************/ 683*******************************************************************************/
684#define CsrWifiSmeCcxConfigSetReqCreate(msg__, dst__, src__, interfaceTag__, ccxConfig__) \ 684#define CsrWifiSmeCcxConfigSetReqCreate(msg__, dst__, src__, interfaceTag__, ccxConfig__) \
685 msg__ = (CsrWifiSmeCcxConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeCcxConfigSetReq)); \ 685 msg__ = kmalloc(sizeof(CsrWifiSmeCcxConfigSetReq), GFP_KERNEL); \
686 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CCX_CONFIG_SET_REQ, dst__, src__); \ 686 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CCX_CONFIG_SET_REQ, dst__, src__); \
687 msg__->interfaceTag = (interfaceTag__); \ 687 msg__->interfaceTag = (interfaceTag__); \
688 msg__->ccxConfig = (ccxConfig__); 688 msg__->ccxConfig = (ccxConfig__);
@@ -712,7 +712,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
712 712
713*******************************************************************************/ 713*******************************************************************************/
714#define CsrWifiSmeCcxConfigSetCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \ 714#define CsrWifiSmeCcxConfigSetCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \
715 msg__ = (CsrWifiSmeCcxConfigSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeCcxConfigSetCfm)); \ 715 msg__ = kmalloc(sizeof(CsrWifiSmeCcxConfigSetCfm), GFP_KERNEL); \
716 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CCX_CONFIG_SET_CFM, dst__, src__); \ 716 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CCX_CONFIG_SET_CFM, dst__, src__); \
717 msg__->interfaceTag = (interfaceTag__); \ 717 msg__->interfaceTag = (interfaceTag__); \
718 msg__->status = (status__); 718 msg__->status = (status__);
@@ -740,7 +740,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
740 740
741*******************************************************************************/ 741*******************************************************************************/
742#define CsrWifiSmeCloakedSsidsGetReqCreate(msg__, dst__, src__) \ 742#define CsrWifiSmeCloakedSsidsGetReqCreate(msg__, dst__, src__) \
743 msg__ = (CsrWifiSmeCloakedSsidsGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeCloakedSsidsGetReq)); \ 743 msg__ = kmalloc(sizeof(CsrWifiSmeCloakedSsidsGetReq), GFP_KERNEL); \
744 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CLOAKED_SSIDS_GET_REQ, dst__, src__); 744 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CLOAKED_SSIDS_GET_REQ, dst__, src__);
745 745
746#define CsrWifiSmeCloakedSsidsGetReqSendTo(dst__, src__) \ 746#define CsrWifiSmeCloakedSsidsGetReqSendTo(dst__, src__) \
@@ -769,7 +769,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
769 769
770*******************************************************************************/ 770*******************************************************************************/
771#define CsrWifiSmeCloakedSsidsGetCfmCreate(msg__, dst__, src__, status__, cloakedSsids__) \ 771#define CsrWifiSmeCloakedSsidsGetCfmCreate(msg__, dst__, src__, status__, cloakedSsids__) \
772 msg__ = (CsrWifiSmeCloakedSsidsGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeCloakedSsidsGetCfm)); \ 772 msg__ = kmalloc(sizeof(CsrWifiSmeCloakedSsidsGetCfm), GFP_KERNEL); \
773 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CLOAKED_SSIDS_GET_CFM, dst__, src__); \ 773 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CLOAKED_SSIDS_GET_CFM, dst__, src__); \
774 msg__->status = (status__); \ 774 msg__->status = (status__); \
775 msg__->cloakedSsids = (cloakedSsids__); 775 msg__->cloakedSsids = (cloakedSsids__);
@@ -803,7 +803,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
803 803
804*******************************************************************************/ 804*******************************************************************************/
805#define CsrWifiSmeCloakedSsidsSetReqCreate(msg__, dst__, src__, cloakedSsids__) \ 805#define CsrWifiSmeCloakedSsidsSetReqCreate(msg__, dst__, src__, cloakedSsids__) \
806 msg__ = (CsrWifiSmeCloakedSsidsSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeCloakedSsidsSetReq)); \ 806 msg__ = kmalloc(sizeof(CsrWifiSmeCloakedSsidsSetReq), GFP_KERNEL); \
807 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CLOAKED_SSIDS_SET_REQ, dst__, src__); \ 807 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CLOAKED_SSIDS_SET_REQ, dst__, src__); \
808 msg__->cloakedSsids = (cloakedSsids__); 808 msg__->cloakedSsids = (cloakedSsids__);
809 809
@@ -831,7 +831,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
831 831
832*******************************************************************************/ 832*******************************************************************************/
833#define CsrWifiSmeCloakedSsidsSetCfmCreate(msg__, dst__, src__, status__) \ 833#define CsrWifiSmeCloakedSsidsSetCfmCreate(msg__, dst__, src__, status__) \
834 msg__ = (CsrWifiSmeCloakedSsidsSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeCloakedSsidsSetCfm)); \ 834 msg__ = kmalloc(sizeof(CsrWifiSmeCloakedSsidsSetCfm), GFP_KERNEL); \
835 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CLOAKED_SSIDS_SET_CFM, dst__, src__); \ 835 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CLOAKED_SSIDS_SET_CFM, dst__, src__); \
836 msg__->status = (status__); 836 msg__->status = (status__);
837 837
@@ -858,7 +858,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
858 858
859*******************************************************************************/ 859*******************************************************************************/
860#define CsrWifiSmeCoexConfigGetReqCreate(msg__, dst__, src__) \ 860#define CsrWifiSmeCoexConfigGetReqCreate(msg__, dst__, src__) \
861 msg__ = (CsrWifiSmeCoexConfigGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeCoexConfigGetReq)); \ 861 msg__ = kmalloc(sizeof(CsrWifiSmeCoexConfigGetReq), GFP_KERNEL); \
862 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_COEX_CONFIG_GET_REQ, dst__, src__); 862 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_COEX_CONFIG_GET_REQ, dst__, src__);
863 863
864#define CsrWifiSmeCoexConfigGetReqSendTo(dst__, src__) \ 864#define CsrWifiSmeCoexConfigGetReqSendTo(dst__, src__) \
@@ -887,7 +887,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
887 887
888*******************************************************************************/ 888*******************************************************************************/
889#define CsrWifiSmeCoexConfigGetCfmCreate(msg__, dst__, src__, status__, coexConfig__) \ 889#define CsrWifiSmeCoexConfigGetCfmCreate(msg__, dst__, src__, status__, coexConfig__) \
890 msg__ = (CsrWifiSmeCoexConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeCoexConfigGetCfm)); \ 890 msg__ = kmalloc(sizeof(CsrWifiSmeCoexConfigGetCfm), GFP_KERNEL); \
891 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_COEX_CONFIG_GET_CFM, dst__, src__); \ 891 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_COEX_CONFIG_GET_CFM, dst__, src__); \
892 msg__->status = (status__); \ 892 msg__->status = (status__); \
893 msg__->coexConfig = (coexConfig__); 893 msg__->coexConfig = (coexConfig__);
@@ -916,7 +916,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
916 916
917*******************************************************************************/ 917*******************************************************************************/
918#define CsrWifiSmeCoexConfigSetReqCreate(msg__, dst__, src__, coexConfig__) \ 918#define CsrWifiSmeCoexConfigSetReqCreate(msg__, dst__, src__, coexConfig__) \
919 msg__ = (CsrWifiSmeCoexConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeCoexConfigSetReq)); \ 919 msg__ = kmalloc(sizeof(CsrWifiSmeCoexConfigSetReq), GFP_KERNEL); \
920 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_COEX_CONFIG_SET_REQ, dst__, src__); \ 920 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_COEX_CONFIG_SET_REQ, dst__, src__); \
921 msg__->coexConfig = (coexConfig__); 921 msg__->coexConfig = (coexConfig__);
922 922
@@ -944,7 +944,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
944 944
945*******************************************************************************/ 945*******************************************************************************/
946#define CsrWifiSmeCoexConfigSetCfmCreate(msg__, dst__, src__, status__) \ 946#define CsrWifiSmeCoexConfigSetCfmCreate(msg__, dst__, src__, status__) \
947 msg__ = (CsrWifiSmeCoexConfigSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeCoexConfigSetCfm)); \ 947 msg__ = kmalloc(sizeof(CsrWifiSmeCoexConfigSetCfm), GFP_KERNEL); \
948 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_COEX_CONFIG_SET_CFM, dst__, src__); \ 948 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_COEX_CONFIG_SET_CFM, dst__, src__); \
949 msg__->status = (status__); 949 msg__->status = (status__);
950 950
@@ -971,7 +971,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
971 971
972*******************************************************************************/ 972*******************************************************************************/
973#define CsrWifiSmeCoexInfoGetReqCreate(msg__, dst__, src__) \ 973#define CsrWifiSmeCoexInfoGetReqCreate(msg__, dst__, src__) \
974 msg__ = (CsrWifiSmeCoexInfoGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeCoexInfoGetReq)); \ 974 msg__ = kmalloc(sizeof(CsrWifiSmeCoexInfoGetReq), GFP_KERNEL); \
975 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_COEX_INFO_GET_REQ, dst__, src__); 975 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_COEX_INFO_GET_REQ, dst__, src__);
976 976
977#define CsrWifiSmeCoexInfoGetReqSendTo(dst__, src__) \ 977#define CsrWifiSmeCoexInfoGetReqSendTo(dst__, src__) \
@@ -999,7 +999,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
999 999
1000*******************************************************************************/ 1000*******************************************************************************/
1001#define CsrWifiSmeCoexInfoGetCfmCreate(msg__, dst__, src__, status__, coexInfo__) \ 1001#define CsrWifiSmeCoexInfoGetCfmCreate(msg__, dst__, src__, status__, coexInfo__) \
1002 msg__ = (CsrWifiSmeCoexInfoGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeCoexInfoGetCfm)); \ 1002 msg__ = kmalloc(sizeof(CsrWifiSmeCoexInfoGetCfm), GFP_KERNEL); \
1003 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_COEX_INFO_GET_CFM, dst__, src__); \ 1003 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_COEX_INFO_GET_CFM, dst__, src__); \
1004 msg__->status = (status__); \ 1004 msg__->status = (status__); \
1005 msg__->coexInfo = (coexInfo__); 1005 msg__->coexInfo = (coexInfo__);
@@ -1065,7 +1065,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
1065 1065
1066*******************************************************************************/ 1066*******************************************************************************/
1067#define CsrWifiSmeConnectReqCreate(msg__, dst__, src__, interfaceTag__, connectionConfig__) \ 1067#define CsrWifiSmeConnectReqCreate(msg__, dst__, src__, interfaceTag__, connectionConfig__) \
1068 msg__ = (CsrWifiSmeConnectReq *) CsrPmemAlloc(sizeof(CsrWifiSmeConnectReq)); \ 1068 msg__ = kmalloc(sizeof(CsrWifiSmeConnectReq), GFP_KERNEL); \
1069 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CONNECT_REQ, dst__, src__); \ 1069 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CONNECT_REQ, dst__, src__); \
1070 msg__->interfaceTag = (interfaceTag__); \ 1070 msg__->interfaceTag = (interfaceTag__); \
1071 msg__->connectionConfig = (connectionConfig__); 1071 msg__->connectionConfig = (connectionConfig__);
@@ -1098,7 +1098,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
1098 1098
1099*******************************************************************************/ 1099*******************************************************************************/
1100#define CsrWifiSmeConnectCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \ 1100#define CsrWifiSmeConnectCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \
1101 msg__ = (CsrWifiSmeConnectCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeConnectCfm)); \ 1101 msg__ = kmalloc(sizeof(CsrWifiSmeConnectCfm), GFP_KERNEL); \
1102 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CONNECT_CFM, dst__, src__); \ 1102 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CONNECT_CFM, dst__, src__); \
1103 msg__->interfaceTag = (interfaceTag__); \ 1103 msg__->interfaceTag = (interfaceTag__); \
1104 msg__->status = (status__); 1104 msg__->status = (status__);
@@ -1127,7 +1127,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
1127 1127
1128*******************************************************************************/ 1128*******************************************************************************/
1129#define CsrWifiSmeConnectionConfigGetReqCreate(msg__, dst__, src__, interfaceTag__) \ 1129#define CsrWifiSmeConnectionConfigGetReqCreate(msg__, dst__, src__, interfaceTag__) \
1130 msg__ = (CsrWifiSmeConnectionConfigGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeConnectionConfigGetReq)); \ 1130 msg__ = kmalloc(sizeof(CsrWifiSmeConnectionConfigGetReq), GFP_KERNEL); \
1131 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CONNECTION_CONFIG_GET_REQ, dst__, src__); \ 1131 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CONNECTION_CONFIG_GET_REQ, dst__, src__); \
1132 msg__->interfaceTag = (interfaceTag__); 1132 msg__->interfaceTag = (interfaceTag__);
1133 1133
@@ -1157,7 +1157,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
1157 1157
1158*******************************************************************************/ 1158*******************************************************************************/
1159#define CsrWifiSmeConnectionConfigGetCfmCreate(msg__, dst__, src__, interfaceTag__, status__, connectionConfig__) \ 1159#define CsrWifiSmeConnectionConfigGetCfmCreate(msg__, dst__, src__, interfaceTag__, status__, connectionConfig__) \
1160 msg__ = (CsrWifiSmeConnectionConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeConnectionConfigGetCfm)); \ 1160 msg__ = kmalloc(sizeof(CsrWifiSmeConnectionConfigGetCfm), GFP_KERNEL); \
1161 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CONNECTION_CONFIG_GET_CFM, dst__, src__); \ 1161 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CONNECTION_CONFIG_GET_CFM, dst__, src__); \
1162 msg__->interfaceTag = (interfaceTag__); \ 1162 msg__->interfaceTag = (interfaceTag__); \
1163 msg__->status = (status__); \ 1163 msg__->status = (status__); \
@@ -1187,7 +1187,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
1187 1187
1188*******************************************************************************/ 1188*******************************************************************************/
1189#define CsrWifiSmeConnectionInfoGetReqCreate(msg__, dst__, src__, interfaceTag__) \ 1189#define CsrWifiSmeConnectionInfoGetReqCreate(msg__, dst__, src__, interfaceTag__) \
1190 msg__ = (CsrWifiSmeConnectionInfoGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeConnectionInfoGetReq)); \ 1190 msg__ = kmalloc(sizeof(CsrWifiSmeConnectionInfoGetReq), GFP_KERNEL); \
1191 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CONNECTION_INFO_GET_REQ, dst__, src__); \ 1191 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CONNECTION_INFO_GET_REQ, dst__, src__); \
1192 msg__->interfaceTag = (interfaceTag__); 1192 msg__->interfaceTag = (interfaceTag__);
1193 1193
@@ -1217,7 +1217,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
1217 1217
1218*******************************************************************************/ 1218*******************************************************************************/
1219#define CsrWifiSmeConnectionInfoGetCfmCreate(msg__, dst__, src__, interfaceTag__, status__, connectionInfo__) \ 1219#define CsrWifiSmeConnectionInfoGetCfmCreate(msg__, dst__, src__, interfaceTag__, status__, connectionInfo__) \
1220 msg__ = (CsrWifiSmeConnectionInfoGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeConnectionInfoGetCfm)); \ 1220 msg__ = kmalloc(sizeof(CsrWifiSmeConnectionInfoGetCfm), GFP_KERNEL); \
1221 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CONNECTION_INFO_GET_CFM, dst__, src__); \ 1221 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CONNECTION_INFO_GET_CFM, dst__, src__); \
1222 msg__->interfaceTag = (interfaceTag__); \ 1222 msg__->interfaceTag = (interfaceTag__); \
1223 msg__->status = (status__); \ 1223 msg__->status = (status__); \
@@ -1255,7 +1255,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
1255 1255
1256*******************************************************************************/ 1256*******************************************************************************/
1257#define CsrWifiSmeConnectionQualityIndCreate(msg__, dst__, src__, interfaceTag__, linkQuality__) \ 1257#define CsrWifiSmeConnectionQualityIndCreate(msg__, dst__, src__, interfaceTag__, linkQuality__) \
1258 msg__ = (CsrWifiSmeConnectionQualityInd *) CsrPmemAlloc(sizeof(CsrWifiSmeConnectionQualityInd)); \ 1258 msg__ = kmalloc(sizeof(CsrWifiSmeConnectionQualityInd), GFP_KERNEL); \
1259 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CONNECTION_QUALITY_IND, dst__, src__); \ 1259 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CONNECTION_QUALITY_IND, dst__, src__); \
1260 msg__->interfaceTag = (interfaceTag__); \ 1260 msg__->interfaceTag = (interfaceTag__); \
1261 msg__->linkQuality = (linkQuality__); 1261 msg__->linkQuality = (linkQuality__);
@@ -1284,7 +1284,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
1284 1284
1285*******************************************************************************/ 1285*******************************************************************************/
1286#define CsrWifiSmeConnectionStatsGetReqCreate(msg__, dst__, src__, interfaceTag__) \ 1286#define CsrWifiSmeConnectionStatsGetReqCreate(msg__, dst__, src__, interfaceTag__) \
1287 msg__ = (CsrWifiSmeConnectionStatsGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeConnectionStatsGetReq)); \ 1287 msg__ = kmalloc(sizeof(CsrWifiSmeConnectionStatsGetReq), GFP_KERNEL); \
1288 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CONNECTION_STATS_GET_REQ, dst__, src__); \ 1288 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CONNECTION_STATS_GET_REQ, dst__, src__); \
1289 msg__->interfaceTag = (interfaceTag__); 1289 msg__->interfaceTag = (interfaceTag__);
1290 1290
@@ -1314,7 +1314,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
1314 1314
1315*******************************************************************************/ 1315*******************************************************************************/
1316#define CsrWifiSmeConnectionStatsGetCfmCreate(msg__, dst__, src__, interfaceTag__, status__, connectionStats__) \ 1316#define CsrWifiSmeConnectionStatsGetCfmCreate(msg__, dst__, src__, interfaceTag__, status__, connectionStats__) \
1317 msg__ = (CsrWifiSmeConnectionStatsGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeConnectionStatsGetCfm)); \ 1317 msg__ = kmalloc(sizeof(CsrWifiSmeConnectionStatsGetCfm), GFP_KERNEL); \
1318 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CONNECTION_STATS_GET_CFM, dst__, src__); \ 1318 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CONNECTION_STATS_GET_CFM, dst__, src__); \
1319 msg__->interfaceTag = (interfaceTag__); \ 1319 msg__->interfaceTag = (interfaceTag__); \
1320 msg__->status = (status__); \ 1320 msg__->status = (status__); \
@@ -1351,7 +1351,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
1351 1351
1352*******************************************************************************/ 1352*******************************************************************************/
1353#define CsrWifiSmeCoreDumpIndCreate(msg__, dst__, src__, dataLength__, data__) \ 1353#define CsrWifiSmeCoreDumpIndCreate(msg__, dst__, src__, dataLength__, data__) \
1354 msg__ = (CsrWifiSmeCoreDumpInd *) CsrPmemAlloc(sizeof(CsrWifiSmeCoreDumpInd)); \ 1354 msg__ = kmalloc(sizeof(CsrWifiSmeCoreDumpInd), GFP_KERNEL); \
1355 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CORE_DUMP_IND, dst__, src__); \ 1355 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_CORE_DUMP_IND, dst__, src__); \
1356 msg__->dataLength = (dataLength__); \ 1356 msg__->dataLength = (dataLength__); \
1357 msg__->data = (data__); 1357 msg__->data = (data__);
@@ -1379,7 +1379,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
1379 1379
1380*******************************************************************************/ 1380*******************************************************************************/
1381#define CsrWifiSmeDeactivateReqCreate(msg__, dst__, src__) \ 1381#define CsrWifiSmeDeactivateReqCreate(msg__, dst__, src__) \
1382 msg__ = (CsrWifiSmeDeactivateReq *) CsrPmemAlloc(sizeof(CsrWifiSmeDeactivateReq)); \ 1382 msg__ = kmalloc(sizeof(CsrWifiSmeDeactivateReq), GFP_KERNEL); \
1383 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_DEACTIVATE_REQ, dst__, src__); 1383 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_DEACTIVATE_REQ, dst__, src__);
1384 1384
1385#define CsrWifiSmeDeactivateReqSendTo(dst__, src__) \ 1385#define CsrWifiSmeDeactivateReqSendTo(dst__, src__) \
@@ -1408,7 +1408,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
1408 1408
1409*******************************************************************************/ 1409*******************************************************************************/
1410#define CsrWifiSmeDeactivateCfmCreate(msg__, dst__, src__, status__) \ 1410#define CsrWifiSmeDeactivateCfmCreate(msg__, dst__, src__, status__) \
1411 msg__ = (CsrWifiSmeDeactivateCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeDeactivateCfm)); \ 1411 msg__ = kmalloc(sizeof(CsrWifiSmeDeactivateCfm), GFP_KERNEL); \
1412 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_DEACTIVATE_CFM, dst__, src__); \ 1412 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_DEACTIVATE_CFM, dst__, src__); \
1413 msg__->status = (status__); 1413 msg__->status = (status__);
1414 1414
@@ -1437,7 +1437,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
1437 1437
1438*******************************************************************************/ 1438*******************************************************************************/
1439#define CsrWifiSmeDisconnectReqCreate(msg__, dst__, src__, interfaceTag__) \ 1439#define CsrWifiSmeDisconnectReqCreate(msg__, dst__, src__, interfaceTag__) \
1440 msg__ = (CsrWifiSmeDisconnectReq *) CsrPmemAlloc(sizeof(CsrWifiSmeDisconnectReq)); \ 1440 msg__ = kmalloc(sizeof(CsrWifiSmeDisconnectReq), GFP_KERNEL); \
1441 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_DISCONNECT_REQ, dst__, src__); \ 1441 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_DISCONNECT_REQ, dst__, src__); \
1442 msg__->interfaceTag = (interfaceTag__); 1442 msg__->interfaceTag = (interfaceTag__);
1443 1443
@@ -1469,7 +1469,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
1469 1469
1470*******************************************************************************/ 1470*******************************************************************************/
1471#define CsrWifiSmeDisconnectCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \ 1471#define CsrWifiSmeDisconnectCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \
1472 msg__ = (CsrWifiSmeDisconnectCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeDisconnectCfm)); \ 1472 msg__ = kmalloc(sizeof(CsrWifiSmeDisconnectCfm), GFP_KERNEL); \
1473 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_DISCONNECT_CFM, dst__, src__); \ 1473 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_DISCONNECT_CFM, dst__, src__); \
1474 msg__->interfaceTag = (interfaceTag__); \ 1474 msg__->interfaceTag = (interfaceTag__); \
1475 msg__->status = (status__); 1475 msg__->status = (status__);
@@ -1498,7 +1498,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
1498 1498
1499*******************************************************************************/ 1499*******************************************************************************/
1500#define CsrWifiSmeErrorIndCreate(msg__, dst__, src__, errorMessage__) \ 1500#define CsrWifiSmeErrorIndCreate(msg__, dst__, src__, errorMessage__) \
1501 msg__ = (CsrWifiSmeErrorInd *) CsrPmemAlloc(sizeof(CsrWifiSmeErrorInd)); \ 1501 msg__ = kmalloc(sizeof(CsrWifiSmeErrorInd), GFP_KERNEL); \
1502 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ERROR_IND, dst__, src__); \ 1502 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ERROR_IND, dst__, src__); \
1503 msg__->errorMessage = (errorMessage__); 1503 msg__->errorMessage = (errorMessage__);
1504 1504
@@ -1529,7 +1529,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
1529 1529
1530*******************************************************************************/ 1530*******************************************************************************/
1531#define CsrWifiSmeEventMaskSetReqCreate(msg__, dst__, src__, indMask__) \ 1531#define CsrWifiSmeEventMaskSetReqCreate(msg__, dst__, src__, indMask__) \
1532 msg__ = (CsrWifiSmeEventMaskSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeEventMaskSetReq)); \ 1532 msg__ = kmalloc(sizeof(CsrWifiSmeEventMaskSetReq), GFP_KERNEL); \
1533 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_EVENT_MASK_SET_REQ, dst__, src__); \ 1533 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_EVENT_MASK_SET_REQ, dst__, src__); \
1534 msg__->indMask = (indMask__); 1534 msg__->indMask = (indMask__);
1535 1535
@@ -1558,7 +1558,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
1558 1558
1559*******************************************************************************/ 1559*******************************************************************************/
1560#define CsrWifiSmeEventMaskSetCfmCreate(msg__, dst__, src__, status__) \ 1560#define CsrWifiSmeEventMaskSetCfmCreate(msg__, dst__, src__, status__) \
1561 msg__ = (CsrWifiSmeEventMaskSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeEventMaskSetCfm)); \ 1561 msg__ = kmalloc(sizeof(CsrWifiSmeEventMaskSetCfm), GFP_KERNEL); \
1562 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_EVENT_MASK_SET_CFM, dst__, src__); \ 1562 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_EVENT_MASK_SET_CFM, dst__, src__); \
1563 msg__->status = (status__); 1563 msg__->status = (status__);
1564 1564
@@ -1586,7 +1586,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
1586 1586
1587*******************************************************************************/ 1587*******************************************************************************/
1588#define CsrWifiSmeHostConfigGetReqCreate(msg__, dst__, src__, interfaceTag__) \ 1588#define CsrWifiSmeHostConfigGetReqCreate(msg__, dst__, src__, interfaceTag__) \
1589 msg__ = (CsrWifiSmeHostConfigGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeHostConfigGetReq)); \ 1589 msg__ = kmalloc(sizeof(CsrWifiSmeHostConfigGetReq), GFP_KERNEL); \
1590 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_HOST_CONFIG_GET_REQ, dst__, src__); \ 1590 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_HOST_CONFIG_GET_REQ, dst__, src__); \
1591 msg__->interfaceTag = (interfaceTag__); 1591 msg__->interfaceTag = (interfaceTag__);
1592 1592
@@ -1616,7 +1616,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
1616 1616
1617*******************************************************************************/ 1617*******************************************************************************/
1618#define CsrWifiSmeHostConfigGetCfmCreate(msg__, dst__, src__, interfaceTag__, status__, hostConfig__) \ 1618#define CsrWifiSmeHostConfigGetCfmCreate(msg__, dst__, src__, interfaceTag__, status__, hostConfig__) \
1619 msg__ = (CsrWifiSmeHostConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeHostConfigGetCfm)); \ 1619 msg__ = kmalloc(sizeof(CsrWifiSmeHostConfigGetCfm), GFP_KERNEL); \
1620 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_HOST_CONFIG_GET_CFM, dst__, src__); \ 1620 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_HOST_CONFIG_GET_CFM, dst__, src__); \
1621 msg__->interfaceTag = (interfaceTag__); \ 1621 msg__->interfaceTag = (interfaceTag__); \
1622 msg__->status = (status__); \ 1622 msg__->status = (status__); \
@@ -1649,7 +1649,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
1649 1649
1650*******************************************************************************/ 1650*******************************************************************************/
1651#define CsrWifiSmeHostConfigSetReqCreate(msg__, dst__, src__, interfaceTag__, hostConfig__) \ 1651#define CsrWifiSmeHostConfigSetReqCreate(msg__, dst__, src__, interfaceTag__, hostConfig__) \
1652 msg__ = (CsrWifiSmeHostConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeHostConfigSetReq)); \ 1652 msg__ = kmalloc(sizeof(CsrWifiSmeHostConfigSetReq), GFP_KERNEL); \
1653 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_HOST_CONFIG_SET_REQ, dst__, src__); \ 1653 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_HOST_CONFIG_SET_REQ, dst__, src__); \
1654 msg__->interfaceTag = (interfaceTag__); \ 1654 msg__->interfaceTag = (interfaceTag__); \
1655 msg__->hostConfig = (hostConfig__); 1655 msg__->hostConfig = (hostConfig__);
@@ -1679,7 +1679,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
1679 1679
1680*******************************************************************************/ 1680*******************************************************************************/
1681#define CsrWifiSmeHostConfigSetCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \ 1681#define CsrWifiSmeHostConfigSetCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \
1682 msg__ = (CsrWifiSmeHostConfigSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeHostConfigSetCfm)); \ 1682 msg__ = kmalloc(sizeof(CsrWifiSmeHostConfigSetCfm), GFP_KERNEL); \
1683 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_HOST_CONFIG_SET_CFM, dst__, src__); \ 1683 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_HOST_CONFIG_SET_CFM, dst__, src__); \
1684 msg__->interfaceTag = (interfaceTag__); \ 1684 msg__->interfaceTag = (interfaceTag__); \
1685 msg__->status = (status__); 1685 msg__->status = (status__);
@@ -1710,7 +1710,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
1710 1710
1711*******************************************************************************/ 1711*******************************************************************************/
1712#define CsrWifiSmeIbssStationIndCreate(msg__, dst__, src__, address__, isconnected__) \ 1712#define CsrWifiSmeIbssStationIndCreate(msg__, dst__, src__, address__, isconnected__) \
1713 msg__ = (CsrWifiSmeIbssStationInd *) CsrPmemAlloc(sizeof(CsrWifiSmeIbssStationInd)); \ 1713 msg__ = kmalloc(sizeof(CsrWifiSmeIbssStationInd), GFP_KERNEL); \
1714 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_IBSS_STATION_IND, dst__, src__); \ 1714 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_IBSS_STATION_IND, dst__, src__); \
1715 msg__->address = (address__); \ 1715 msg__->address = (address__); \
1716 msg__->isconnected = (isconnected__); 1716 msg__->isconnected = (isconnected__);
@@ -1740,7 +1740,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
1740 1740
1741*******************************************************************************/ 1741*******************************************************************************/
1742#define CsrWifiSmeInfoIndCreate(msg__, dst__, src__, infoMessage__) \ 1742#define CsrWifiSmeInfoIndCreate(msg__, dst__, src__, infoMessage__) \
1743 msg__ = (CsrWifiSmeInfoInd *) CsrPmemAlloc(sizeof(CsrWifiSmeInfoInd)); \ 1743 msg__ = kmalloc(sizeof(CsrWifiSmeInfoInd), GFP_KERNEL); \
1744 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_INFO_IND, dst__, src__); \ 1744 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_INFO_IND, dst__, src__); \
1745 msg__->infoMessage = (infoMessage__); 1745 msg__->infoMessage = (infoMessage__);
1746 1746
@@ -1768,7 +1768,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
1768 1768
1769*******************************************************************************/ 1769*******************************************************************************/
1770#define CsrWifiSmeInterfaceCapabilityGetReqCreate(msg__, dst__, src__) \ 1770#define CsrWifiSmeInterfaceCapabilityGetReqCreate(msg__, dst__, src__) \
1771 msg__ = (CsrWifiSmeInterfaceCapabilityGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeInterfaceCapabilityGetReq)); \ 1771 msg__ = kmalloc(sizeof(CsrWifiSmeInterfaceCapabilityGetReq), GFP_KERNEL); \
1772 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_INTERFACE_CAPABILITY_GET_REQ, dst__, src__); 1772 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_INTERFACE_CAPABILITY_GET_REQ, dst__, src__);
1773 1773
1774#define CsrWifiSmeInterfaceCapabilityGetReqSendTo(dst__, src__) \ 1774#define CsrWifiSmeInterfaceCapabilityGetReqSendTo(dst__, src__) \
@@ -1804,7 +1804,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
1804 1804
1805*******************************************************************************/ 1805*******************************************************************************/
1806#define CsrWifiSmeInterfaceCapabilityGetCfmCreate(msg__, dst__, src__, status__, numInterfaces__, capBitmap__) \ 1806#define CsrWifiSmeInterfaceCapabilityGetCfmCreate(msg__, dst__, src__, status__, numInterfaces__, capBitmap__) \
1807 msg__ = (CsrWifiSmeInterfaceCapabilityGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeInterfaceCapabilityGetCfm)); \ 1807 msg__ = kmalloc(sizeof(CsrWifiSmeInterfaceCapabilityGetCfm), GFP_KERNEL); \
1808 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_INTERFACE_CAPABILITY_GET_CFM, dst__, src__); \ 1808 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_INTERFACE_CAPABILITY_GET_CFM, dst__, src__); \
1809 msg__->status = (status__); \ 1809 msg__->status = (status__); \
1810 msg__->numInterfaces = (numInterfaces__); \ 1810 msg__->numInterfaces = (numInterfaces__); \
@@ -1841,7 +1841,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
1841 1841
1842*******************************************************************************/ 1842*******************************************************************************/
1843#define CsrWifiSmeKeyReqCreate(msg__, dst__, src__, interfaceTag__, action__, key__) \ 1843#define CsrWifiSmeKeyReqCreate(msg__, dst__, src__, interfaceTag__, action__, key__) \
1844 msg__ = (CsrWifiSmeKeyReq *) CsrPmemAlloc(sizeof(CsrWifiSmeKeyReq)); \ 1844 msg__ = kmalloc(sizeof(CsrWifiSmeKeyReq), GFP_KERNEL); \
1845 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_KEY_REQ, dst__, src__); \ 1845 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_KEY_REQ, dst__, src__); \
1846 msg__->interfaceTag = (interfaceTag__); \ 1846 msg__->interfaceTag = (interfaceTag__); \
1847 msg__->action = (action__); \ 1847 msg__->action = (action__); \
@@ -1876,7 +1876,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
1876 1876
1877*******************************************************************************/ 1877*******************************************************************************/
1878#define CsrWifiSmeKeyCfmCreate(msg__, dst__, src__, interfaceTag__, status__, action__, keyType__, peerMacAddress__) \ 1878#define CsrWifiSmeKeyCfmCreate(msg__, dst__, src__, interfaceTag__, status__, action__, keyType__, peerMacAddress__) \
1879 msg__ = (CsrWifiSmeKeyCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeKeyCfm)); \ 1879 msg__ = kmalloc(sizeof(CsrWifiSmeKeyCfm), GFP_KERNEL); \
1880 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_KEY_CFM, dst__, src__); \ 1880 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_KEY_CFM, dst__, src__); \
1881 msg__->interfaceTag = (interfaceTag__); \ 1881 msg__->interfaceTag = (interfaceTag__); \
1882 msg__->status = (status__); \ 1882 msg__->status = (status__); \
@@ -1908,7 +1908,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
1908 1908
1909*******************************************************************************/ 1909*******************************************************************************/
1910#define CsrWifiSmeLinkQualityGetReqCreate(msg__, dst__, src__, interfaceTag__) \ 1910#define CsrWifiSmeLinkQualityGetReqCreate(msg__, dst__, src__, interfaceTag__) \
1911 msg__ = (CsrWifiSmeLinkQualityGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeLinkQualityGetReq)); \ 1911 msg__ = kmalloc(sizeof(CsrWifiSmeLinkQualityGetReq), GFP_KERNEL); \
1912 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_LINK_QUALITY_GET_REQ, dst__, src__); \ 1912 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_LINK_QUALITY_GET_REQ, dst__, src__); \
1913 msg__->interfaceTag = (interfaceTag__); 1913 msg__->interfaceTag = (interfaceTag__);
1914 1914
@@ -1938,7 +1938,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
1938 1938
1939*******************************************************************************/ 1939*******************************************************************************/
1940#define CsrWifiSmeLinkQualityGetCfmCreate(msg__, dst__, src__, interfaceTag__, status__, linkQuality__) \ 1940#define CsrWifiSmeLinkQualityGetCfmCreate(msg__, dst__, src__, interfaceTag__, status__, linkQuality__) \
1941 msg__ = (CsrWifiSmeLinkQualityGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeLinkQualityGetCfm)); \ 1941 msg__ = kmalloc(sizeof(CsrWifiSmeLinkQualityGetCfm), GFP_KERNEL); \
1942 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_LINK_QUALITY_GET_CFM, dst__, src__); \ 1942 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_LINK_QUALITY_GET_CFM, dst__, src__); \
1943 msg__->interfaceTag = (interfaceTag__); \ 1943 msg__->interfaceTag = (interfaceTag__); \
1944 msg__->status = (status__); \ 1944 msg__->status = (status__); \
@@ -1982,7 +1982,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
1982 1982
1983*******************************************************************************/ 1983*******************************************************************************/
1984#define CsrWifiSmeMediaStatusIndCreate(msg__, dst__, src__, interfaceTag__, mediaStatus__, connectionInfo__, disassocReason__, deauthReason__) \ 1984#define CsrWifiSmeMediaStatusIndCreate(msg__, dst__, src__, interfaceTag__, mediaStatus__, connectionInfo__, disassocReason__, deauthReason__) \
1985 msg__ = (CsrWifiSmeMediaStatusInd *) CsrPmemAlloc(sizeof(CsrWifiSmeMediaStatusInd)); \ 1985 msg__ = kmalloc(sizeof(CsrWifiSmeMediaStatusInd), GFP_KERNEL); \
1986 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MEDIA_STATUS_IND, dst__, src__); \ 1986 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MEDIA_STATUS_IND, dst__, src__); \
1987 msg__->interfaceTag = (interfaceTag__); \ 1987 msg__->interfaceTag = (interfaceTag__); \
1988 msg__->mediaStatus = (mediaStatus__); \ 1988 msg__->mediaStatus = (mediaStatus__); \
@@ -2013,7 +2013,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
2013 2013
2014*******************************************************************************/ 2014*******************************************************************************/
2015#define CsrWifiSmeMibConfigGetReqCreate(msg__, dst__, src__) \ 2015#define CsrWifiSmeMibConfigGetReqCreate(msg__, dst__, src__) \
2016 msg__ = (CsrWifiSmeMibConfigGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeMibConfigGetReq)); \ 2016 msg__ = kmalloc(sizeof(CsrWifiSmeMibConfigGetReq), GFP_KERNEL); \
2017 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MIB_CONFIG_GET_REQ, dst__, src__); 2017 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MIB_CONFIG_GET_REQ, dst__, src__);
2018 2018
2019#define CsrWifiSmeMibConfigGetReqSendTo(dst__, src__) \ 2019#define CsrWifiSmeMibConfigGetReqSendTo(dst__, src__) \
@@ -2041,7 +2041,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
2041 2041
2042*******************************************************************************/ 2042*******************************************************************************/
2043#define CsrWifiSmeMibConfigGetCfmCreate(msg__, dst__, src__, status__, mibConfig__) \ 2043#define CsrWifiSmeMibConfigGetCfmCreate(msg__, dst__, src__, status__, mibConfig__) \
2044 msg__ = (CsrWifiSmeMibConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeMibConfigGetCfm)); \ 2044 msg__ = kmalloc(sizeof(CsrWifiSmeMibConfigGetCfm), GFP_KERNEL); \
2045 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MIB_CONFIG_GET_CFM, dst__, src__); \ 2045 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MIB_CONFIG_GET_CFM, dst__, src__); \
2046 msg__->status = (status__); \ 2046 msg__->status = (status__); \
2047 msg__->mibConfig = (mibConfig__); 2047 msg__->mibConfig = (mibConfig__);
@@ -2071,7 +2071,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
2071 2071
2072*******************************************************************************/ 2072*******************************************************************************/
2073#define CsrWifiSmeMibConfigSetReqCreate(msg__, dst__, src__, mibConfig__) \ 2073#define CsrWifiSmeMibConfigSetReqCreate(msg__, dst__, src__, mibConfig__) \
2074 msg__ = (CsrWifiSmeMibConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeMibConfigSetReq)); \ 2074 msg__ = kmalloc(sizeof(CsrWifiSmeMibConfigSetReq), GFP_KERNEL); \
2075 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MIB_CONFIG_SET_REQ, dst__, src__); \ 2075 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MIB_CONFIG_SET_REQ, dst__, src__); \
2076 msg__->mibConfig = (mibConfig__); 2076 msg__->mibConfig = (mibConfig__);
2077 2077
@@ -2099,7 +2099,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
2099 2099
2100*******************************************************************************/ 2100*******************************************************************************/
2101#define CsrWifiSmeMibConfigSetCfmCreate(msg__, dst__, src__, status__) \ 2101#define CsrWifiSmeMibConfigSetCfmCreate(msg__, dst__, src__, status__) \
2102 msg__ = (CsrWifiSmeMibConfigSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeMibConfigSetCfm)); \ 2102 msg__ = kmalloc(sizeof(CsrWifiSmeMibConfigSetCfm), GFP_KERNEL); \
2103 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MIB_CONFIG_SET_CFM, dst__, src__); \ 2103 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MIB_CONFIG_SET_CFM, dst__, src__); \
2104 msg__->status = (status__); 2104 msg__->status = (status__);
2105 2105
@@ -2130,7 +2130,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
2130 2130
2131*******************************************************************************/ 2131*******************************************************************************/
2132#define CsrWifiSmeMibGetCfmCreate(msg__, dst__, src__, status__, mibAttributeLength__, mibAttribute__) \ 2132#define CsrWifiSmeMibGetCfmCreate(msg__, dst__, src__, status__, mibAttributeLength__, mibAttribute__) \
2133 msg__ = (CsrWifiSmeMibGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeMibGetCfm)); \ 2133 msg__ = kmalloc(sizeof(CsrWifiSmeMibGetCfm), GFP_KERNEL); \
2134 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MIB_GET_CFM, dst__, src__); \ 2134 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MIB_GET_CFM, dst__, src__); \
2135 msg__->status = (status__); \ 2135 msg__->status = (status__); \
2136 msg__->mibAttributeLength = (mibAttributeLength__); \ 2136 msg__->mibAttributeLength = (mibAttributeLength__); \
@@ -2163,7 +2163,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
2163 2163
2164*******************************************************************************/ 2164*******************************************************************************/
2165#define CsrWifiSmeMibGetNextReqCreate(msg__, dst__, src__, mibAttributeLength__, mibAttribute__) \ 2165#define CsrWifiSmeMibGetNextReqCreate(msg__, dst__, src__, mibAttributeLength__, mibAttribute__) \
2166 msg__ = (CsrWifiSmeMibGetNextReq *) CsrPmemAlloc(sizeof(CsrWifiSmeMibGetNextReq)); \ 2166 msg__ = kmalloc(sizeof(CsrWifiSmeMibGetNextReq), GFP_KERNEL); \
2167 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MIB_GET_NEXT_REQ, dst__, src__); \ 2167 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MIB_GET_NEXT_REQ, dst__, src__); \
2168 msg__->mibAttributeLength = (mibAttributeLength__); \ 2168 msg__->mibAttributeLength = (mibAttributeLength__); \
2169 msg__->mibAttribute = (mibAttribute__); 2169 msg__->mibAttribute = (mibAttribute__);
@@ -2198,7 +2198,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
2198 2198
2199*******************************************************************************/ 2199*******************************************************************************/
2200#define CsrWifiSmeMibGetNextCfmCreate(msg__, dst__, src__, status__, mibAttributeLength__, mibAttribute__) \ 2200#define CsrWifiSmeMibGetNextCfmCreate(msg__, dst__, src__, status__, mibAttributeLength__, mibAttribute__) \
2201 msg__ = (CsrWifiSmeMibGetNextCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeMibGetNextCfm)); \ 2201 msg__ = kmalloc(sizeof(CsrWifiSmeMibGetNextCfm), GFP_KERNEL); \
2202 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MIB_GET_NEXT_CFM, dst__, src__); \ 2202 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MIB_GET_NEXT_CFM, dst__, src__); \
2203 msg__->status = (status__); \ 2203 msg__->status = (status__); \
2204 msg__->mibAttributeLength = (mibAttributeLength__); \ 2204 msg__->mibAttributeLength = (mibAttributeLength__); \
@@ -2231,7 +2231,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
2231 2231
2232*******************************************************************************/ 2232*******************************************************************************/
2233#define CsrWifiSmeMibGetReqCreate(msg__, dst__, src__, mibAttributeLength__, mibAttribute__) \ 2233#define CsrWifiSmeMibGetReqCreate(msg__, dst__, src__, mibAttributeLength__, mibAttribute__) \
2234 msg__ = (CsrWifiSmeMibGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeMibGetReq)); \ 2234 msg__ = kmalloc(sizeof(CsrWifiSmeMibGetReq), GFP_KERNEL); \
2235 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MIB_GET_REQ, dst__, src__); \ 2235 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MIB_GET_REQ, dst__, src__); \
2236 msg__->mibAttributeLength = (mibAttributeLength__); \ 2236 msg__->mibAttributeLength = (mibAttributeLength__); \
2237 msg__->mibAttribute = (mibAttribute__); 2237 msg__->mibAttribute = (mibAttribute__);
@@ -2271,7 +2271,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
2271 2271
2272*******************************************************************************/ 2272*******************************************************************************/
2273#define CsrWifiSmeMibSetReqCreate(msg__, dst__, src__, mibAttributeLength__, mibAttribute__) \ 2273#define CsrWifiSmeMibSetReqCreate(msg__, dst__, src__, mibAttributeLength__, mibAttribute__) \
2274 msg__ = (CsrWifiSmeMibSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeMibSetReq)); \ 2274 msg__ = kmalloc(sizeof(CsrWifiSmeMibSetReq), GFP_KERNEL); \
2275 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MIB_SET_REQ, dst__, src__); \ 2275 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MIB_SET_REQ, dst__, src__); \
2276 msg__->mibAttributeLength = (mibAttributeLength__); \ 2276 msg__->mibAttributeLength = (mibAttributeLength__); \
2277 msg__->mibAttribute = (mibAttribute__); 2277 msg__->mibAttribute = (mibAttribute__);
@@ -2300,7 +2300,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
2300 2300
2301*******************************************************************************/ 2301*******************************************************************************/
2302#define CsrWifiSmeMibSetCfmCreate(msg__, dst__, src__, status__) \ 2302#define CsrWifiSmeMibSetCfmCreate(msg__, dst__, src__, status__) \
2303 msg__ = (CsrWifiSmeMibSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeMibSetCfm)); \ 2303 msg__ = kmalloc(sizeof(CsrWifiSmeMibSetCfm), GFP_KERNEL); \
2304 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MIB_SET_CFM, dst__, src__); \ 2304 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MIB_SET_CFM, dst__, src__); \
2305 msg__->status = (status__); 2305 msg__->status = (status__);
2306 2306
@@ -2335,7 +2335,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
2335 2335
2336*******************************************************************************/ 2336*******************************************************************************/
2337#define CsrWifiSmeMicFailureIndCreate(msg__, dst__, src__, interfaceTag__, secondFailure__, count__, address__, keyType__) \ 2337#define CsrWifiSmeMicFailureIndCreate(msg__, dst__, src__, interfaceTag__, secondFailure__, count__, address__, keyType__) \
2338 msg__ = (CsrWifiSmeMicFailureInd *) CsrPmemAlloc(sizeof(CsrWifiSmeMicFailureInd)); \ 2338 msg__ = kmalloc(sizeof(CsrWifiSmeMicFailureInd), GFP_KERNEL); \
2339 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MIC_FAILURE_IND, dst__, src__); \ 2339 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MIC_FAILURE_IND, dst__, src__); \
2340 msg__->interfaceTag = (interfaceTag__); \ 2340 msg__->interfaceTag = (interfaceTag__); \
2341 msg__->secondFailure = (secondFailure__); \ 2341 msg__->secondFailure = (secondFailure__); \
@@ -2377,7 +2377,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
2377 2377
2378*******************************************************************************/ 2378*******************************************************************************/
2379#define CsrWifiSmeMulticastAddressReqCreate(msg__, dst__, src__, interfaceTag__, action__, setAddressesCount__, setAddresses__) \ 2379#define CsrWifiSmeMulticastAddressReqCreate(msg__, dst__, src__, interfaceTag__, action__, setAddressesCount__, setAddresses__) \
2380 msg__ = (CsrWifiSmeMulticastAddressReq *) CsrPmemAlloc(sizeof(CsrWifiSmeMulticastAddressReq)); \ 2380 msg__ = kmalloc(sizeof(CsrWifiSmeMulticastAddressReq), GFP_KERNEL); \
2381 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MULTICAST_ADDRESS_REQ, dst__, src__); \ 2381 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MULTICAST_ADDRESS_REQ, dst__, src__); \
2382 msg__->interfaceTag = (interfaceTag__); \ 2382 msg__->interfaceTag = (interfaceTag__); \
2383 msg__->action = (action__); \ 2383 msg__->action = (action__); \
@@ -2416,7 +2416,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
2416 2416
2417*******************************************************************************/ 2417*******************************************************************************/
2418#define CsrWifiSmeMulticastAddressCfmCreate(msg__, dst__, src__, interfaceTag__, status__, action__, getAddressesCount__, getAddresses__) \ 2418#define CsrWifiSmeMulticastAddressCfmCreate(msg__, dst__, src__, interfaceTag__, status__, action__, getAddressesCount__, getAddresses__) \
2419 msg__ = (CsrWifiSmeMulticastAddressCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeMulticastAddressCfm)); \ 2419 msg__ = kmalloc(sizeof(CsrWifiSmeMulticastAddressCfm), GFP_KERNEL); \
2420 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MULTICAST_ADDRESS_CFM, dst__, src__); \ 2420 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_MULTICAST_ADDRESS_CFM, dst__, src__); \
2421 msg__->interfaceTag = (interfaceTag__); \ 2421 msg__->interfaceTag = (interfaceTag__); \
2422 msg__->status = (status__); \ 2422 msg__->status = (status__); \
@@ -2476,7 +2476,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
2476 2476
2477*******************************************************************************/ 2477*******************************************************************************/
2478#define CsrWifiSmePacketFilterSetReqCreate(msg__, dst__, src__, interfaceTag__, filterLength__, filter__, mode__, arpFilterAddress__) \ 2478#define CsrWifiSmePacketFilterSetReqCreate(msg__, dst__, src__, interfaceTag__, filterLength__, filter__, mode__, arpFilterAddress__) \
2479 msg__ = (CsrWifiSmePacketFilterSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmePacketFilterSetReq)); \ 2479 msg__ = kmalloc(sizeof(CsrWifiSmePacketFilterSetReq), GFP_KERNEL); \
2480 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_PACKET_FILTER_SET_REQ, dst__, src__); \ 2480 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_PACKET_FILTER_SET_REQ, dst__, src__); \
2481 msg__->interfaceTag = (interfaceTag__); \ 2481 msg__->interfaceTag = (interfaceTag__); \
2482 msg__->filterLength = (filterLength__); \ 2482 msg__->filterLength = (filterLength__); \
@@ -2509,7 +2509,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
2509 2509
2510*******************************************************************************/ 2510*******************************************************************************/
2511#define CsrWifiSmePacketFilterSetCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \ 2511#define CsrWifiSmePacketFilterSetCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \
2512 msg__ = (CsrWifiSmePacketFilterSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmePacketFilterSetCfm)); \ 2512 msg__ = kmalloc(sizeof(CsrWifiSmePacketFilterSetCfm), GFP_KERNEL); \
2513 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_PACKET_FILTER_SET_CFM, dst__, src__); \ 2513 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_PACKET_FILTER_SET_CFM, dst__, src__); \
2514 msg__->interfaceTag = (interfaceTag__); \ 2514 msg__->interfaceTag = (interfaceTag__); \
2515 msg__->status = (status__); 2515 msg__->status = (status__);
@@ -2537,7 +2537,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
2537 2537
2538*******************************************************************************/ 2538*******************************************************************************/
2539#define CsrWifiSmePermanentMacAddressGetReqCreate(msg__, dst__, src__) \ 2539#define CsrWifiSmePermanentMacAddressGetReqCreate(msg__, dst__, src__) \
2540 msg__ = (CsrWifiSmePermanentMacAddressGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmePermanentMacAddressGetReq)); \ 2540 msg__ = kmalloc(sizeof(CsrWifiSmePermanentMacAddressGetReq), GFP_KERNEL); \
2541 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_PERMANENT_MAC_ADDRESS_GET_REQ, dst__, src__); 2541 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_PERMANENT_MAC_ADDRESS_GET_REQ, dst__, src__);
2542 2542
2543#define CsrWifiSmePermanentMacAddressGetReqSendTo(dst__, src__) \ 2543#define CsrWifiSmePermanentMacAddressGetReqSendTo(dst__, src__) \
@@ -2565,7 +2565,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
2565 2565
2566*******************************************************************************/ 2566*******************************************************************************/
2567#define CsrWifiSmePermanentMacAddressGetCfmCreate(msg__, dst__, src__, status__, permanentMacAddress__) \ 2567#define CsrWifiSmePermanentMacAddressGetCfmCreate(msg__, dst__, src__, status__, permanentMacAddress__) \
2568 msg__ = (CsrWifiSmePermanentMacAddressGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmePermanentMacAddressGetCfm)); \ 2568 msg__ = kmalloc(sizeof(CsrWifiSmePermanentMacAddressGetCfm), GFP_KERNEL); \
2569 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_PERMANENT_MAC_ADDRESS_GET_CFM, dst__, src__); \ 2569 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_PERMANENT_MAC_ADDRESS_GET_CFM, dst__, src__); \
2570 msg__->status = (status__); \ 2570 msg__->status = (status__); \
2571 msg__->permanentMacAddress = (permanentMacAddress__); 2571 msg__->permanentMacAddress = (permanentMacAddress__);
@@ -2599,7 +2599,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
2599 2599
2600*******************************************************************************/ 2600*******************************************************************************/
2601#define CsrWifiSmePmkidCandidateListIndCreate(msg__, dst__, src__, interfaceTag__, pmkidCandidatesCount__, pmkidCandidates__) \ 2601#define CsrWifiSmePmkidCandidateListIndCreate(msg__, dst__, src__, interfaceTag__, pmkidCandidatesCount__, pmkidCandidates__) \
2602 msg__ = (CsrWifiSmePmkidCandidateListInd *) CsrPmemAlloc(sizeof(CsrWifiSmePmkidCandidateListInd)); \ 2602 msg__ = kmalloc(sizeof(CsrWifiSmePmkidCandidateListInd), GFP_KERNEL); \
2603 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_PMKID_CANDIDATE_LIST_IND, dst__, src__); \ 2603 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_PMKID_CANDIDATE_LIST_IND, dst__, src__); \
2604 msg__->interfaceTag = (interfaceTag__); \ 2604 msg__->interfaceTag = (interfaceTag__); \
2605 msg__->pmkidCandidatesCount = (pmkidCandidatesCount__); \ 2605 msg__->pmkidCandidatesCount = (pmkidCandidatesCount__); \
@@ -2641,7 +2641,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
2641 2641
2642*******************************************************************************/ 2642*******************************************************************************/
2643#define CsrWifiSmePmkidReqCreate(msg__, dst__, src__, interfaceTag__, action__, setPmkidsCount__, setPmkids__) \ 2643#define CsrWifiSmePmkidReqCreate(msg__, dst__, src__, interfaceTag__, action__, setPmkidsCount__, setPmkids__) \
2644 msg__ = (CsrWifiSmePmkidReq *) CsrPmemAlloc(sizeof(CsrWifiSmePmkidReq)); \ 2644 msg__ = kmalloc(sizeof(CsrWifiSmePmkidReq), GFP_KERNEL); \
2645 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_PMKID_REQ, dst__, src__); \ 2645 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_PMKID_REQ, dst__, src__); \
2646 msg__->interfaceTag = (interfaceTag__); \ 2646 msg__->interfaceTag = (interfaceTag__); \
2647 msg__->action = (action__); \ 2647 msg__->action = (action__); \
@@ -2680,7 +2680,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
2680 2680
2681*******************************************************************************/ 2681*******************************************************************************/
2682#define CsrWifiSmePmkidCfmCreate(msg__, dst__, src__, interfaceTag__, status__, action__, getPmkidsCount__, getPmkids__) \ 2682#define CsrWifiSmePmkidCfmCreate(msg__, dst__, src__, interfaceTag__, status__, action__, getPmkidsCount__, getPmkids__) \
2683 msg__ = (CsrWifiSmePmkidCfm *) CsrPmemAlloc(sizeof(CsrWifiSmePmkidCfm)); \ 2683 msg__ = kmalloc(sizeof(CsrWifiSmePmkidCfm), GFP_KERNEL); \
2684 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_PMKID_CFM, dst__, src__); \ 2684 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_PMKID_CFM, dst__, src__); \
2685 msg__->interfaceTag = (interfaceTag__); \ 2685 msg__->interfaceTag = (interfaceTag__); \
2686 msg__->status = (status__); \ 2686 msg__->status = (status__); \
@@ -2711,7 +2711,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
2711 2711
2712*******************************************************************************/ 2712*******************************************************************************/
2713#define CsrWifiSmePowerConfigGetReqCreate(msg__, dst__, src__) \ 2713#define CsrWifiSmePowerConfigGetReqCreate(msg__, dst__, src__) \
2714 msg__ = (CsrWifiSmePowerConfigGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmePowerConfigGetReq)); \ 2714 msg__ = kmalloc(sizeof(CsrWifiSmePowerConfigGetReq), GFP_KERNEL); \
2715 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_POWER_CONFIG_GET_REQ, dst__, src__); 2715 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_POWER_CONFIG_GET_REQ, dst__, src__);
2716 2716
2717#define CsrWifiSmePowerConfigGetReqSendTo(dst__, src__) \ 2717#define CsrWifiSmePowerConfigGetReqSendTo(dst__, src__) \
@@ -2740,7 +2740,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
2740 2740
2741*******************************************************************************/ 2741*******************************************************************************/
2742#define CsrWifiSmePowerConfigGetCfmCreate(msg__, dst__, src__, status__, powerConfig__) \ 2742#define CsrWifiSmePowerConfigGetCfmCreate(msg__, dst__, src__, status__, powerConfig__) \
2743 msg__ = (CsrWifiSmePowerConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmePowerConfigGetCfm)); \ 2743 msg__ = kmalloc(sizeof(CsrWifiSmePowerConfigGetCfm), GFP_KERNEL); \
2744 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_POWER_CONFIG_GET_CFM, dst__, src__); \ 2744 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_POWER_CONFIG_GET_CFM, dst__, src__); \
2745 msg__->status = (status__); \ 2745 msg__->status = (status__); \
2746 msg__->powerConfig = (powerConfig__); 2746 msg__->powerConfig = (powerConfig__);
@@ -2769,7 +2769,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
2769 2769
2770*******************************************************************************/ 2770*******************************************************************************/
2771#define CsrWifiSmePowerConfigSetReqCreate(msg__, dst__, src__, powerConfig__) \ 2771#define CsrWifiSmePowerConfigSetReqCreate(msg__, dst__, src__, powerConfig__) \
2772 msg__ = (CsrWifiSmePowerConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmePowerConfigSetReq)); \ 2772 msg__ = kmalloc(sizeof(CsrWifiSmePowerConfigSetReq), GFP_KERNEL); \
2773 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_POWER_CONFIG_SET_REQ, dst__, src__); \ 2773 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_POWER_CONFIG_SET_REQ, dst__, src__); \
2774 msg__->powerConfig = (powerConfig__); 2774 msg__->powerConfig = (powerConfig__);
2775 2775
@@ -2797,7 +2797,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
2797 2797
2798*******************************************************************************/ 2798*******************************************************************************/
2799#define CsrWifiSmePowerConfigSetCfmCreate(msg__, dst__, src__, status__) \ 2799#define CsrWifiSmePowerConfigSetCfmCreate(msg__, dst__, src__, status__) \
2800 msg__ = (CsrWifiSmePowerConfigSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmePowerConfigSetCfm)); \ 2800 msg__ = kmalloc(sizeof(CsrWifiSmePowerConfigSetCfm), GFP_KERNEL); \
2801 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_POWER_CONFIG_SET_CFM, dst__, src__); \ 2801 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_POWER_CONFIG_SET_CFM, dst__, src__); \
2802 msg__->status = (status__); 2802 msg__->status = (status__);
2803 2803
@@ -2824,7 +2824,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
2824 2824
2825*******************************************************************************/ 2825*******************************************************************************/
2826#define CsrWifiSmeRegulatoryDomainInfoGetReqCreate(msg__, dst__, src__) \ 2826#define CsrWifiSmeRegulatoryDomainInfoGetReqCreate(msg__, dst__, src__) \
2827 msg__ = (CsrWifiSmeRegulatoryDomainInfoGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeRegulatoryDomainInfoGetReq)); \ 2827 msg__ = kmalloc(sizeof(CsrWifiSmeRegulatoryDomainInfoGetReq), GFP_KERNEL); \
2828 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_REGULATORY_DOMAIN_INFO_GET_REQ, dst__, src__); 2828 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_REGULATORY_DOMAIN_INFO_GET_REQ, dst__, src__);
2829 2829
2830#define CsrWifiSmeRegulatoryDomainInfoGetReqSendTo(dst__, src__) \ 2830#define CsrWifiSmeRegulatoryDomainInfoGetReqSendTo(dst__, src__) \
@@ -2853,7 +2853,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
2853 2853
2854*******************************************************************************/ 2854*******************************************************************************/
2855#define CsrWifiSmeRegulatoryDomainInfoGetCfmCreate(msg__, dst__, src__, status__, regDomInfo__) \ 2855#define CsrWifiSmeRegulatoryDomainInfoGetCfmCreate(msg__, dst__, src__, status__, regDomInfo__) \
2856 msg__ = (CsrWifiSmeRegulatoryDomainInfoGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeRegulatoryDomainInfoGetCfm)); \ 2856 msg__ = kmalloc(sizeof(CsrWifiSmeRegulatoryDomainInfoGetCfm), GFP_KERNEL); \
2857 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_REGULATORY_DOMAIN_INFO_GET_CFM, dst__, src__); \ 2857 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_REGULATORY_DOMAIN_INFO_GET_CFM, dst__, src__); \
2858 msg__->status = (status__); \ 2858 msg__->status = (status__); \
2859 msg__->regDomInfo = (regDomInfo__); 2859 msg__->regDomInfo = (regDomInfo__);
@@ -2886,7 +2886,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
2886 2886
2887*******************************************************************************/ 2887*******************************************************************************/
2888#define CsrWifiSmeRoamCompleteIndCreate(msg__, dst__, src__, interfaceTag__, status__) \ 2888#define CsrWifiSmeRoamCompleteIndCreate(msg__, dst__, src__, interfaceTag__, status__) \
2889 msg__ = (CsrWifiSmeRoamCompleteInd *) CsrPmemAlloc(sizeof(CsrWifiSmeRoamCompleteInd)); \ 2889 msg__ = kmalloc(sizeof(CsrWifiSmeRoamCompleteInd), GFP_KERNEL); \
2890 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ROAM_COMPLETE_IND, dst__, src__); \ 2890 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ROAM_COMPLETE_IND, dst__, src__); \
2891 msg__->interfaceTag = (interfaceTag__); \ 2891 msg__->interfaceTag = (interfaceTag__); \
2892 msg__->status = (status__); 2892 msg__->status = (status__);
@@ -2935,7 +2935,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
2935 2935
2936*******************************************************************************/ 2936*******************************************************************************/
2937#define CsrWifiSmeRoamStartIndCreate(msg__, dst__, src__, interfaceTag__, roamReason__, reason80211__) \ 2937#define CsrWifiSmeRoamStartIndCreate(msg__, dst__, src__, interfaceTag__, roamReason__, reason80211__) \
2938 msg__ = (CsrWifiSmeRoamStartInd *) CsrPmemAlloc(sizeof(CsrWifiSmeRoamStartInd)); \ 2938 msg__ = kmalloc(sizeof(CsrWifiSmeRoamStartInd), GFP_KERNEL); \
2939 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ROAM_START_IND, dst__, src__); \ 2939 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ROAM_START_IND, dst__, src__); \
2940 msg__->interfaceTag = (interfaceTag__); \ 2940 msg__->interfaceTag = (interfaceTag__); \
2941 msg__->roamReason = (roamReason__); \ 2941 msg__->roamReason = (roamReason__); \
@@ -2965,7 +2965,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
2965 2965
2966*******************************************************************************/ 2966*******************************************************************************/
2967#define CsrWifiSmeRoamingConfigGetReqCreate(msg__, dst__, src__, interfaceTag__) \ 2967#define CsrWifiSmeRoamingConfigGetReqCreate(msg__, dst__, src__, interfaceTag__) \
2968 msg__ = (CsrWifiSmeRoamingConfigGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeRoamingConfigGetReq)); \ 2968 msg__ = kmalloc(sizeof(CsrWifiSmeRoamingConfigGetReq), GFP_KERNEL); \
2969 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ROAMING_CONFIG_GET_REQ, dst__, src__); \ 2969 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ROAMING_CONFIG_GET_REQ, dst__, src__); \
2970 msg__->interfaceTag = (interfaceTag__); 2970 msg__->interfaceTag = (interfaceTag__);
2971 2971
@@ -2995,7 +2995,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
2995 2995
2996*******************************************************************************/ 2996*******************************************************************************/
2997#define CsrWifiSmeRoamingConfigGetCfmCreate(msg__, dst__, src__, interfaceTag__, status__, roamingConfig__) \ 2997#define CsrWifiSmeRoamingConfigGetCfmCreate(msg__, dst__, src__, interfaceTag__, status__, roamingConfig__) \
2998 msg__ = (CsrWifiSmeRoamingConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeRoamingConfigGetCfm)); \ 2998 msg__ = kmalloc(sizeof(CsrWifiSmeRoamingConfigGetCfm), GFP_KERNEL); \
2999 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ROAMING_CONFIG_GET_CFM, dst__, src__); \ 2999 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ROAMING_CONFIG_GET_CFM, dst__, src__); \
3000 msg__->interfaceTag = (interfaceTag__); \ 3000 msg__->interfaceTag = (interfaceTag__); \
3001 msg__->status = (status__); \ 3001 msg__->status = (status__); \
@@ -3026,7 +3026,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
3026 3026
3027*******************************************************************************/ 3027*******************************************************************************/
3028#define CsrWifiSmeRoamingConfigSetReqCreate(msg__, dst__, src__, interfaceTag__, roamingConfig__) \ 3028#define CsrWifiSmeRoamingConfigSetReqCreate(msg__, dst__, src__, interfaceTag__, roamingConfig__) \
3029 msg__ = (CsrWifiSmeRoamingConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeRoamingConfigSetReq)); \ 3029 msg__ = kmalloc(sizeof(CsrWifiSmeRoamingConfigSetReq), GFP_KERNEL); \
3030 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ROAMING_CONFIG_SET_REQ, dst__, src__); \ 3030 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ROAMING_CONFIG_SET_REQ, dst__, src__); \
3031 msg__->interfaceTag = (interfaceTag__); \ 3031 msg__->interfaceTag = (interfaceTag__); \
3032 msg__->roamingConfig = (roamingConfig__); 3032 msg__->roamingConfig = (roamingConfig__);
@@ -3056,7 +3056,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
3056 3056
3057*******************************************************************************/ 3057*******************************************************************************/
3058#define CsrWifiSmeRoamingConfigSetCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \ 3058#define CsrWifiSmeRoamingConfigSetCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \
3059 msg__ = (CsrWifiSmeRoamingConfigSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeRoamingConfigSetCfm)); \ 3059 msg__ = kmalloc(sizeof(CsrWifiSmeRoamingConfigSetCfm), GFP_KERNEL); \
3060 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ROAMING_CONFIG_SET_CFM, dst__, src__); \ 3060 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_ROAMING_CONFIG_SET_CFM, dst__, src__); \
3061 msg__->interfaceTag = (interfaceTag__); \ 3061 msg__->interfaceTag = (interfaceTag__); \
3062 msg__->status = (status__); 3062 msg__->status = (status__);
@@ -3084,7 +3084,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
3084 3084
3085*******************************************************************************/ 3085*******************************************************************************/
3086#define CsrWifiSmeScanConfigGetReqCreate(msg__, dst__, src__) \ 3086#define CsrWifiSmeScanConfigGetReqCreate(msg__, dst__, src__) \
3087 msg__ = (CsrWifiSmeScanConfigGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeScanConfigGetReq)); \ 3087 msg__ = kmalloc(sizeof(CsrWifiSmeScanConfigGetReq), GFP_KERNEL); \
3088 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SCAN_CONFIG_GET_REQ, dst__, src__); 3088 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SCAN_CONFIG_GET_REQ, dst__, src__);
3089 3089
3090#define CsrWifiSmeScanConfigGetReqSendTo(dst__, src__) \ 3090#define CsrWifiSmeScanConfigGetReqSendTo(dst__, src__) \
@@ -3113,7 +3113,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
3113 3113
3114*******************************************************************************/ 3114*******************************************************************************/
3115#define CsrWifiSmeScanConfigGetCfmCreate(msg__, dst__, src__, status__, scanConfig__) \ 3115#define CsrWifiSmeScanConfigGetCfmCreate(msg__, dst__, src__, status__, scanConfig__) \
3116 msg__ = (CsrWifiSmeScanConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeScanConfigGetCfm)); \ 3116 msg__ = kmalloc(sizeof(CsrWifiSmeScanConfigGetCfm), GFP_KERNEL); \
3117 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SCAN_CONFIG_GET_CFM, dst__, src__); \ 3117 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SCAN_CONFIG_GET_CFM, dst__, src__); \
3118 msg__->status = (status__); \ 3118 msg__->status = (status__); \
3119 msg__->scanConfig = (scanConfig__); 3119 msg__->scanConfig = (scanConfig__);
@@ -3153,7 +3153,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
3153 3153
3154*******************************************************************************/ 3154*******************************************************************************/
3155#define CsrWifiSmeScanConfigSetReqCreate(msg__, dst__, src__, scanConfig__) \ 3155#define CsrWifiSmeScanConfigSetReqCreate(msg__, dst__, src__, scanConfig__) \
3156 msg__ = (CsrWifiSmeScanConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeScanConfigSetReq)); \ 3156 msg__ = kmalloc(sizeof(CsrWifiSmeScanConfigSetReq), GFP_KERNEL); \
3157 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SCAN_CONFIG_SET_REQ, dst__, src__); \ 3157 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SCAN_CONFIG_SET_REQ, dst__, src__); \
3158 msg__->scanConfig = (scanConfig__); 3158 msg__->scanConfig = (scanConfig__);
3159 3159
@@ -3181,7 +3181,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
3181 3181
3182*******************************************************************************/ 3182*******************************************************************************/
3183#define CsrWifiSmeScanConfigSetCfmCreate(msg__, dst__, src__, status__) \ 3183#define CsrWifiSmeScanConfigSetCfmCreate(msg__, dst__, src__, status__) \
3184 msg__ = (CsrWifiSmeScanConfigSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeScanConfigSetCfm)); \ 3184 msg__ = kmalloc(sizeof(CsrWifiSmeScanConfigSetCfm), GFP_KERNEL); \
3185 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SCAN_CONFIG_SET_CFM, dst__, src__); \ 3185 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SCAN_CONFIG_SET_CFM, dst__, src__); \
3186 msg__->status = (status__); 3186 msg__->status = (status__);
3187 3187
@@ -3236,7 +3236,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
3236 3236
3237*******************************************************************************/ 3237*******************************************************************************/
3238#define CsrWifiSmeScanFullReqCreate(msg__, dst__, src__, ssidCount__, ssid__, bssid__, forceScan__, bssType__, scanType__, channelListCount__, channelList__, probeIeLength__, probeIe__) \ 3238#define CsrWifiSmeScanFullReqCreate(msg__, dst__, src__, ssidCount__, ssid__, bssid__, forceScan__, bssType__, scanType__, channelListCount__, channelList__, probeIeLength__, probeIe__) \
3239 msg__ = (CsrWifiSmeScanFullReq *) CsrPmemAlloc(sizeof(CsrWifiSmeScanFullReq)); \ 3239 msg__ = kmalloc(sizeof(CsrWifiSmeScanFullReq), GFP_KERNEL); \
3240 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SCAN_FULL_REQ, dst__, src__); \ 3240 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SCAN_FULL_REQ, dst__, src__); \
3241 msg__->ssidCount = (ssidCount__); \ 3241 msg__->ssidCount = (ssidCount__); \
3242 msg__->ssid = (ssid__); \ 3242 msg__->ssid = (ssid__); \
@@ -3274,7 +3274,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
3274 3274
3275*******************************************************************************/ 3275*******************************************************************************/
3276#define CsrWifiSmeScanFullCfmCreate(msg__, dst__, src__, status__) \ 3276#define CsrWifiSmeScanFullCfmCreate(msg__, dst__, src__, status__) \
3277 msg__ = (CsrWifiSmeScanFullCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeScanFullCfm)); \ 3277 msg__ = kmalloc(sizeof(CsrWifiSmeScanFullCfm), GFP_KERNEL); \
3278 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SCAN_FULL_CFM, dst__, src__); \ 3278 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SCAN_FULL_CFM, dst__, src__); \
3279 msg__->status = (status__); 3279 msg__->status = (status__);
3280 3280
@@ -3303,7 +3303,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
3303 3303
3304*******************************************************************************/ 3304*******************************************************************************/
3305#define CsrWifiSmeScanResultIndCreate(msg__, dst__, src__, result__) \ 3305#define CsrWifiSmeScanResultIndCreate(msg__, dst__, src__, result__) \
3306 msg__ = (CsrWifiSmeScanResultInd *) CsrPmemAlloc(sizeof(CsrWifiSmeScanResultInd)); \ 3306 msg__ = kmalloc(sizeof(CsrWifiSmeScanResultInd), GFP_KERNEL); \
3307 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SCAN_RESULT_IND, dst__, src__); \ 3307 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SCAN_RESULT_IND, dst__, src__); \
3308 msg__->result = (result__); 3308 msg__->result = (result__);
3309 3309
@@ -3339,7 +3339,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
3339 3339
3340*******************************************************************************/ 3340*******************************************************************************/
3341#define CsrWifiSmeScanResultsFlushReqCreate(msg__, dst__, src__) \ 3341#define CsrWifiSmeScanResultsFlushReqCreate(msg__, dst__, src__) \
3342 msg__ = (CsrWifiSmeScanResultsFlushReq *) CsrPmemAlloc(sizeof(CsrWifiSmeScanResultsFlushReq)); \ 3342 msg__ = kmalloc(sizeof(CsrWifiSmeScanResultsFlushReq), GFP_KERNEL); \
3343 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SCAN_RESULTS_FLUSH_REQ, dst__, src__); 3343 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SCAN_RESULTS_FLUSH_REQ, dst__, src__);
3344 3344
3345#define CsrWifiSmeScanResultsFlushReqSendTo(dst__, src__) \ 3345#define CsrWifiSmeScanResultsFlushReqSendTo(dst__, src__) \
@@ -3366,7 +3366,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
3366 3366
3367*******************************************************************************/ 3367*******************************************************************************/
3368#define CsrWifiSmeScanResultsFlushCfmCreate(msg__, dst__, src__, status__) \ 3368#define CsrWifiSmeScanResultsFlushCfmCreate(msg__, dst__, src__, status__) \
3369 msg__ = (CsrWifiSmeScanResultsFlushCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeScanResultsFlushCfm)); \ 3369 msg__ = kmalloc(sizeof(CsrWifiSmeScanResultsFlushCfm), GFP_KERNEL); \
3370 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SCAN_RESULTS_FLUSH_CFM, dst__, src__); \ 3370 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SCAN_RESULTS_FLUSH_CFM, dst__, src__); \
3371 msg__->status = (status__); 3371 msg__->status = (status__);
3372 3372
@@ -3395,7 +3395,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
3395 3395
3396*******************************************************************************/ 3396*******************************************************************************/
3397#define CsrWifiSmeScanResultsGetReqCreate(msg__, dst__, src__) \ 3397#define CsrWifiSmeScanResultsGetReqCreate(msg__, dst__, src__) \
3398 msg__ = (CsrWifiSmeScanResultsGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeScanResultsGetReq)); \ 3398 msg__ = kmalloc(sizeof(CsrWifiSmeScanResultsGetReq), GFP_KERNEL); \
3399 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SCAN_RESULTS_GET_REQ, dst__, src__); 3399 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SCAN_RESULTS_GET_REQ, dst__, src__);
3400 3400
3401#define CsrWifiSmeScanResultsGetReqSendTo(dst__, src__) \ 3401#define CsrWifiSmeScanResultsGetReqSendTo(dst__, src__) \
@@ -3425,7 +3425,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
3425 3425
3426*******************************************************************************/ 3426*******************************************************************************/
3427#define CsrWifiSmeScanResultsGetCfmCreate(msg__, dst__, src__, status__, scanResultsCount__, scanResults__) \ 3427#define CsrWifiSmeScanResultsGetCfmCreate(msg__, dst__, src__, status__, scanResultsCount__, scanResults__) \
3428 msg__ = (CsrWifiSmeScanResultsGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeScanResultsGetCfm)); \ 3428 msg__ = kmalloc(sizeof(CsrWifiSmeScanResultsGetCfm), GFP_KERNEL); \
3429 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SCAN_RESULTS_GET_CFM, dst__, src__); \ 3429 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SCAN_RESULTS_GET_CFM, dst__, src__); \
3430 msg__->status = (status__); \ 3430 msg__->status = (status__); \
3431 msg__->scanResultsCount = (scanResultsCount__); \ 3431 msg__->scanResultsCount = (scanResultsCount__); \
@@ -3459,7 +3459,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
3459 3459
3460*******************************************************************************/ 3460*******************************************************************************/
3461#define CsrWifiSmeSetReqCreate(msg__, dst__, src__, dataLength__, data__) \ 3461#define CsrWifiSmeSetReqCreate(msg__, dst__, src__, dataLength__, data__) \
3462 msg__ = (CsrWifiSmeSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeSetReq)); \ 3462 msg__ = kmalloc(sizeof(CsrWifiSmeSetReq), GFP_KERNEL); \
3463 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SET_REQ, dst__, src__); \ 3463 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SET_REQ, dst__, src__); \
3464 msg__->dataLength = (dataLength__); \ 3464 msg__->dataLength = (dataLength__); \
3465 msg__->data = (data__); 3465 msg__->data = (data__);
@@ -3487,7 +3487,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
3487 3487
3488*******************************************************************************/ 3488*******************************************************************************/
3489#define CsrWifiSmeSmeCommonConfigGetReqCreate(msg__, dst__, src__) \ 3489#define CsrWifiSmeSmeCommonConfigGetReqCreate(msg__, dst__, src__) \
3490 msg__ = (CsrWifiSmeSmeCommonConfigGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeSmeCommonConfigGetReq)); \ 3490 msg__ = kmalloc(sizeof(CsrWifiSmeSmeCommonConfigGetReq), GFP_KERNEL); \
3491 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SME_COMMON_CONFIG_GET_REQ, dst__, src__); 3491 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SME_COMMON_CONFIG_GET_REQ, dst__, src__);
3492 3492
3493#define CsrWifiSmeSmeCommonConfigGetReqSendTo(dst__, src__) \ 3493#define CsrWifiSmeSmeCommonConfigGetReqSendTo(dst__, src__) \
@@ -3515,7 +3515,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
3515 3515
3516*******************************************************************************/ 3516*******************************************************************************/
3517#define CsrWifiSmeSmeCommonConfigGetCfmCreate(msg__, dst__, src__, status__, deviceConfig__) \ 3517#define CsrWifiSmeSmeCommonConfigGetCfmCreate(msg__, dst__, src__, status__, deviceConfig__) \
3518 msg__ = (CsrWifiSmeSmeCommonConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeSmeCommonConfigGetCfm)); \ 3518 msg__ = kmalloc(sizeof(CsrWifiSmeSmeCommonConfigGetCfm), GFP_KERNEL); \
3519 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SME_COMMON_CONFIG_GET_CFM, dst__, src__); \ 3519 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SME_COMMON_CONFIG_GET_CFM, dst__, src__); \
3520 msg__->status = (status__); \ 3520 msg__->status = (status__); \
3521 msg__->deviceConfig = (deviceConfig__); 3521 msg__->deviceConfig = (deviceConfig__);
@@ -3544,7 +3544,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
3544 3544
3545*******************************************************************************/ 3545*******************************************************************************/
3546#define CsrWifiSmeSmeCommonConfigSetReqCreate(msg__, dst__, src__, deviceConfig__) \ 3546#define CsrWifiSmeSmeCommonConfigSetReqCreate(msg__, dst__, src__, deviceConfig__) \
3547 msg__ = (CsrWifiSmeSmeCommonConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeSmeCommonConfigSetReq)); \ 3547 msg__ = kmalloc(sizeof(CsrWifiSmeSmeCommonConfigSetReq), GFP_KERNEL); \
3548 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SME_COMMON_CONFIG_SET_REQ, dst__, src__); \ 3548 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SME_COMMON_CONFIG_SET_REQ, dst__, src__); \
3549 msg__->deviceConfig = (deviceConfig__); 3549 msg__->deviceConfig = (deviceConfig__);
3550 3550
@@ -3572,7 +3572,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
3572 3572
3573*******************************************************************************/ 3573*******************************************************************************/
3574#define CsrWifiSmeSmeCommonConfigSetCfmCreate(msg__, dst__, src__, status__) \ 3574#define CsrWifiSmeSmeCommonConfigSetCfmCreate(msg__, dst__, src__, status__) \
3575 msg__ = (CsrWifiSmeSmeCommonConfigSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeSmeCommonConfigSetCfm)); \ 3575 msg__ = kmalloc(sizeof(CsrWifiSmeSmeCommonConfigSetCfm), GFP_KERNEL); \
3576 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SME_COMMON_CONFIG_SET_CFM, dst__, src__); \ 3576 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SME_COMMON_CONFIG_SET_CFM, dst__, src__); \
3577 msg__->status = (status__); 3577 msg__->status = (status__);
3578 3578
@@ -3600,7 +3600,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
3600 3600
3601*******************************************************************************/ 3601*******************************************************************************/
3602#define CsrWifiSmeSmeStaConfigGetReqCreate(msg__, dst__, src__, interfaceTag__) \ 3602#define CsrWifiSmeSmeStaConfigGetReqCreate(msg__, dst__, src__, interfaceTag__) \
3603 msg__ = (CsrWifiSmeSmeStaConfigGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeSmeStaConfigGetReq)); \ 3603 msg__ = kmalloc(sizeof(CsrWifiSmeSmeStaConfigGetReq), GFP_KERNEL); \
3604 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SME_STA_CONFIG_GET_REQ, dst__, src__); \ 3604 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SME_STA_CONFIG_GET_REQ, dst__, src__); \
3605 msg__->interfaceTag = (interfaceTag__); 3605 msg__->interfaceTag = (interfaceTag__);
3606 3606
@@ -3630,7 +3630,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
3630 3630
3631*******************************************************************************/ 3631*******************************************************************************/
3632#define CsrWifiSmeSmeStaConfigGetCfmCreate(msg__, dst__, src__, interfaceTag__, status__, smeConfig__) \ 3632#define CsrWifiSmeSmeStaConfigGetCfmCreate(msg__, dst__, src__, interfaceTag__, status__, smeConfig__) \
3633 msg__ = (CsrWifiSmeSmeStaConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeSmeStaConfigGetCfm)); \ 3633 msg__ = kmalloc(sizeof(CsrWifiSmeSmeStaConfigGetCfm), GFP_KERNEL); \
3634 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SME_STA_CONFIG_GET_CFM, dst__, src__); \ 3634 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SME_STA_CONFIG_GET_CFM, dst__, src__); \
3635 msg__->interfaceTag = (interfaceTag__); \ 3635 msg__->interfaceTag = (interfaceTag__); \
3636 msg__->status = (status__); \ 3636 msg__->status = (status__); \
@@ -3661,7 +3661,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
3661 3661
3662*******************************************************************************/ 3662*******************************************************************************/
3663#define CsrWifiSmeSmeStaConfigSetReqCreate(msg__, dst__, src__, interfaceTag__, smeConfig__) \ 3663#define CsrWifiSmeSmeStaConfigSetReqCreate(msg__, dst__, src__, interfaceTag__, smeConfig__) \
3664 msg__ = (CsrWifiSmeSmeStaConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeSmeStaConfigSetReq)); \ 3664 msg__ = kmalloc(sizeof(CsrWifiSmeSmeStaConfigSetReq), GFP_KERNEL); \
3665 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SME_STA_CONFIG_SET_REQ, dst__, src__); \ 3665 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SME_STA_CONFIG_SET_REQ, dst__, src__); \
3666 msg__->interfaceTag = (interfaceTag__); \ 3666 msg__->interfaceTag = (interfaceTag__); \
3667 msg__->smeConfig = (smeConfig__); 3667 msg__->smeConfig = (smeConfig__);
@@ -3691,7 +3691,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
3691 3691
3692*******************************************************************************/ 3692*******************************************************************************/
3693#define CsrWifiSmeSmeStaConfigSetCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \ 3693#define CsrWifiSmeSmeStaConfigSetCfmCreate(msg__, dst__, src__, interfaceTag__, status__) \
3694 msg__ = (CsrWifiSmeSmeStaConfigSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeSmeStaConfigSetCfm)); \ 3694 msg__ = kmalloc(sizeof(CsrWifiSmeSmeStaConfigSetCfm), GFP_KERNEL); \
3695 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SME_STA_CONFIG_SET_CFM, dst__, src__); \ 3695 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_SME_STA_CONFIG_SET_CFM, dst__, src__); \
3696 msg__->interfaceTag = (interfaceTag__); \ 3696 msg__->interfaceTag = (interfaceTag__); \
3697 msg__->status = (status__); 3697 msg__->status = (status__);
@@ -3720,7 +3720,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
3720 3720
3721*******************************************************************************/ 3721*******************************************************************************/
3722#define CsrWifiSmeStationMacAddressGetReqCreate(msg__, dst__, src__) \ 3722#define CsrWifiSmeStationMacAddressGetReqCreate(msg__, dst__, src__) \
3723 msg__ = (CsrWifiSmeStationMacAddressGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeStationMacAddressGetReq)); \ 3723 msg__ = kmalloc(sizeof(CsrWifiSmeStationMacAddressGetReq), GFP_KERNEL); \
3724 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_STATION_MAC_ADDRESS_GET_REQ, dst__, src__); 3724 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_STATION_MAC_ADDRESS_GET_REQ, dst__, src__);
3725 3725
3726#define CsrWifiSmeStationMacAddressGetReqSendTo(dst__, src__) \ 3726#define CsrWifiSmeStationMacAddressGetReqSendTo(dst__, src__) \
@@ -3748,7 +3748,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
3748 3748
3749*******************************************************************************/ 3749*******************************************************************************/
3750#define CsrWifiSmeStationMacAddressGetCfmCreate(msg__, dst__, src__, status__, stationMacAddress__) \ 3750#define CsrWifiSmeStationMacAddressGetCfmCreate(msg__, dst__, src__, status__, stationMacAddress__) \
3751 msg__ = (CsrWifiSmeStationMacAddressGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeStationMacAddressGetCfm)); \ 3751 msg__ = kmalloc(sizeof(CsrWifiSmeStationMacAddressGetCfm), GFP_KERNEL); \
3752 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_STATION_MAC_ADDRESS_GET_CFM, dst__, src__); \ 3752 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_STATION_MAC_ADDRESS_GET_CFM, dst__, src__); \
3753 msg__->status = (status__); \ 3753 msg__->status = (status__); \
3754 memcpy(msg__->stationMacAddress, (stationMacAddress__), sizeof(CsrWifiMacAddress) * 2); 3754 memcpy(msg__->stationMacAddress, (stationMacAddress__), sizeof(CsrWifiMacAddress) * 2);
@@ -3806,7 +3806,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
3806 3806
3807*******************************************************************************/ 3807*******************************************************************************/
3808#define CsrWifiSmeTspecReqCreate(msg__, dst__, src__, interfaceTag__, action__, transactionId__, strict__, ctrlMask__, tspecLength__, tspec__, tclasLength__, tclas__) \ 3808#define CsrWifiSmeTspecReqCreate(msg__, dst__, src__, interfaceTag__, action__, transactionId__, strict__, ctrlMask__, tspecLength__, tspec__, tclasLength__, tclas__) \
3809 msg__ = (CsrWifiSmeTspecReq *) CsrPmemAlloc(sizeof(CsrWifiSmeTspecReq)); \ 3809 msg__ = kmalloc(sizeof(CsrWifiSmeTspecReq), GFP_KERNEL); \
3810 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_TSPEC_REQ, dst__, src__); \ 3810 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_TSPEC_REQ, dst__, src__); \
3811 msg__->interfaceTag = (interfaceTag__); \ 3811 msg__->interfaceTag = (interfaceTag__); \
3812 msg__->action = (action__); \ 3812 msg__->action = (action__); \
@@ -3849,7 +3849,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
3849 3849
3850*******************************************************************************/ 3850*******************************************************************************/
3851#define CsrWifiSmeTspecIndCreate(msg__, dst__, src__, interfaceTag__, transactionId__, tspecResultCode__, tspecLength__, tspec__) \ 3851#define CsrWifiSmeTspecIndCreate(msg__, dst__, src__, interfaceTag__, transactionId__, tspecResultCode__, tspecLength__, tspec__) \
3852 msg__ = (CsrWifiSmeTspecInd *) CsrPmemAlloc(sizeof(CsrWifiSmeTspecInd)); \ 3852 msg__ = kmalloc(sizeof(CsrWifiSmeTspecInd), GFP_KERNEL); \
3853 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_TSPEC_IND, dst__, src__); \ 3853 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_TSPEC_IND, dst__, src__); \
3854 msg__->interfaceTag = (interfaceTag__); \ 3854 msg__->interfaceTag = (interfaceTag__); \
3855 msg__->transactionId = (transactionId__); \ 3855 msg__->transactionId = (transactionId__); \
@@ -3888,7 +3888,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
3888 3888
3889*******************************************************************************/ 3889*******************************************************************************/
3890#define CsrWifiSmeTspecCfmCreate(msg__, dst__, src__, interfaceTag__, status__, transactionId__, tspecResultCode__, tspecLength__, tspec__) \ 3890#define CsrWifiSmeTspecCfmCreate(msg__, dst__, src__, interfaceTag__, status__, transactionId__, tspecResultCode__, tspecLength__, tspec__) \
3891 msg__ = (CsrWifiSmeTspecCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeTspecCfm)); \ 3891 msg__ = kmalloc(sizeof(CsrWifiSmeTspecCfm), GFP_KERNEL); \
3892 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_TSPEC_CFM, dst__, src__); \ 3892 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_TSPEC_CFM, dst__, src__); \
3893 msg__->interfaceTag = (interfaceTag__); \ 3893 msg__->interfaceTag = (interfaceTag__); \
3894 msg__->status = (status__); \ 3894 msg__->status = (status__); \
@@ -3920,7 +3920,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
3920 3920
3921*******************************************************************************/ 3921*******************************************************************************/
3922#define CsrWifiSmeVersionsGetReqCreate(msg__, dst__, src__) \ 3922#define CsrWifiSmeVersionsGetReqCreate(msg__, dst__, src__) \
3923 msg__ = (CsrWifiSmeVersionsGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeVersionsGetReq)); \ 3923 msg__ = kmalloc(sizeof(CsrWifiSmeVersionsGetReq), GFP_KERNEL); \
3924 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_VERSIONS_GET_REQ, dst__, src__); 3924 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_VERSIONS_GET_REQ, dst__, src__);
3925 3925
3926#define CsrWifiSmeVersionsGetReqSendTo(dst__, src__) \ 3926#define CsrWifiSmeVersionsGetReqSendTo(dst__, src__) \
@@ -3948,7 +3948,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
3948 3948
3949*******************************************************************************/ 3949*******************************************************************************/
3950#define CsrWifiSmeVersionsGetCfmCreate(msg__, dst__, src__, status__, versions__) \ 3950#define CsrWifiSmeVersionsGetCfmCreate(msg__, dst__, src__, status__, versions__) \
3951 msg__ = (CsrWifiSmeVersionsGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeVersionsGetCfm)); \ 3951 msg__ = kmalloc(sizeof(CsrWifiSmeVersionsGetCfm), GFP_KERNEL); \
3952 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_VERSIONS_GET_CFM, dst__, src__); \ 3952 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_VERSIONS_GET_CFM, dst__, src__); \
3953 msg__->status = (status__); \ 3953 msg__->status = (status__); \
3954 msg__->versions = (versions__); 3954 msg__->versions = (versions__);
@@ -4005,7 +4005,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
4005 4005
4006*******************************************************************************/ 4006*******************************************************************************/
4007#define CsrWifiSmeWifiFlightmodeReqCreate(msg__, dst__, src__, address__, mibFilesCount__, mibFiles__) \ 4007#define CsrWifiSmeWifiFlightmodeReqCreate(msg__, dst__, src__, address__, mibFilesCount__, mibFiles__) \
4008 msg__ = (CsrWifiSmeWifiFlightmodeReq *) CsrPmemAlloc(sizeof(CsrWifiSmeWifiFlightmodeReq)); \ 4008 msg__ = kmalloc(sizeof(CsrWifiSmeWifiFlightmodeReq), GFP_KERNEL); \
4009 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_WIFI_FLIGHTMODE_REQ, dst__, src__); \ 4009 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_WIFI_FLIGHTMODE_REQ, dst__, src__); \
4010 msg__->address = (address__); \ 4010 msg__->address = (address__); \
4011 msg__->mibFilesCount = (mibFilesCount__); \ 4011 msg__->mibFilesCount = (mibFilesCount__); \
@@ -4038,7 +4038,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
4038 4038
4039*******************************************************************************/ 4039*******************************************************************************/
4040#define CsrWifiSmeWifiFlightmodeCfmCreate(msg__, dst__, src__, status__) \ 4040#define CsrWifiSmeWifiFlightmodeCfmCreate(msg__, dst__, src__, status__) \
4041 msg__ = (CsrWifiSmeWifiFlightmodeCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeWifiFlightmodeCfm)); \ 4041 msg__ = kmalloc(sizeof(CsrWifiSmeWifiFlightmodeCfm), GFP_KERNEL); \
4042 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_WIFI_FLIGHTMODE_CFM, dst__, src__); \ 4042 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_WIFI_FLIGHTMODE_CFM, dst__, src__); \
4043 msg__->status = (status__); 4043 msg__->status = (status__);
4044 4044
@@ -4066,7 +4066,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
4066 4066
4067*******************************************************************************/ 4067*******************************************************************************/
4068#define CsrWifiSmeWifiOffReqCreate(msg__, dst__, src__) \ 4068#define CsrWifiSmeWifiOffReqCreate(msg__, dst__, src__) \
4069 msg__ = (CsrWifiSmeWifiOffReq *) CsrPmemAlloc(sizeof(CsrWifiSmeWifiOffReq)); \ 4069 msg__ = kmalloc(sizeof(CsrWifiSmeWifiOffReq), GFP_KERNEL); \
4070 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_WIFI_OFF_REQ, dst__, src__); 4070 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_WIFI_OFF_REQ, dst__, src__);
4071 4071
4072#define CsrWifiSmeWifiOffReqSendTo(dst__, src__) \ 4072#define CsrWifiSmeWifiOffReqSendTo(dst__, src__) \
@@ -4094,7 +4094,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
4094 4094
4095*******************************************************************************/ 4095*******************************************************************************/
4096#define CsrWifiSmeWifiOffIndCreate(msg__, dst__, src__, reason__) \ 4096#define CsrWifiSmeWifiOffIndCreate(msg__, dst__, src__, reason__) \
4097 msg__ = (CsrWifiSmeWifiOffInd *) CsrPmemAlloc(sizeof(CsrWifiSmeWifiOffInd)); \ 4097 msg__ = kmalloc(sizeof(CsrWifiSmeWifiOffInd), GFP_KERNEL); \
4098 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_WIFI_OFF_IND, dst__, src__); \ 4098 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_WIFI_OFF_IND, dst__, src__); \
4099 msg__->reason = (reason__); 4099 msg__->reason = (reason__);
4100 4100
@@ -4126,7 +4126,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
4126 4126
4127*******************************************************************************/ 4127*******************************************************************************/
4128#define CsrWifiSmeWifiOffCfmCreate(msg__, dst__, src__, status__) \ 4128#define CsrWifiSmeWifiOffCfmCreate(msg__, dst__, src__, status__) \
4129 msg__ = (CsrWifiSmeWifiOffCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeWifiOffCfm)); \ 4129 msg__ = kmalloc(sizeof(CsrWifiSmeWifiOffCfm), GFP_KERNEL); \
4130 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_WIFI_OFF_CFM, dst__, src__); \ 4130 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_WIFI_OFF_CFM, dst__, src__); \
4131 msg__->status = (status__); 4131 msg__->status = (status__);
4132 4132
@@ -4175,7 +4175,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
4175 4175
4176*******************************************************************************/ 4176*******************************************************************************/
4177#define CsrWifiSmeWifiOnReqCreate(msg__, dst__, src__, address__, mibFilesCount__, mibFiles__) \ 4177#define CsrWifiSmeWifiOnReqCreate(msg__, dst__, src__, address__, mibFilesCount__, mibFiles__) \
4178 msg__ = (CsrWifiSmeWifiOnReq *) CsrPmemAlloc(sizeof(CsrWifiSmeWifiOnReq)); \ 4178 msg__ = kmalloc(sizeof(CsrWifiSmeWifiOnReq), GFP_KERNEL); \
4179 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_WIFI_ON_REQ, dst__, src__); \ 4179 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_WIFI_ON_REQ, dst__, src__); \
4180 msg__->address = (address__); \ 4180 msg__->address = (address__); \
4181 msg__->mibFilesCount = (mibFilesCount__); \ 4181 msg__->mibFilesCount = (mibFilesCount__); \
@@ -4206,7 +4206,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
4206 4206
4207*******************************************************************************/ 4207*******************************************************************************/
4208#define CsrWifiSmeWifiOnIndCreate(msg__, dst__, src__, address__) \ 4208#define CsrWifiSmeWifiOnIndCreate(msg__, dst__, src__, address__) \
4209 msg__ = (CsrWifiSmeWifiOnInd *) CsrPmemAlloc(sizeof(CsrWifiSmeWifiOnInd)); \ 4209 msg__ = kmalloc(sizeof(CsrWifiSmeWifiOnInd), GFP_KERNEL); \
4210 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_WIFI_ON_IND, dst__, src__); \ 4210 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_WIFI_ON_IND, dst__, src__); \
4211 msg__->address = (address__); 4211 msg__->address = (address__);
4212 4212
@@ -4235,7 +4235,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
4235 4235
4236*******************************************************************************/ 4236*******************************************************************************/
4237#define CsrWifiSmeWifiOnCfmCreate(msg__, dst__, src__, status__) \ 4237#define CsrWifiSmeWifiOnCfmCreate(msg__, dst__, src__, status__) \
4238 msg__ = (CsrWifiSmeWifiOnCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeWifiOnCfm)); \ 4238 msg__ = kmalloc(sizeof(CsrWifiSmeWifiOnCfm), GFP_KERNEL); \
4239 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_WIFI_ON_CFM, dst__, src__); \ 4239 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_WIFI_ON_CFM, dst__, src__); \
4240 msg__->status = (status__); 4240 msg__->status = (status__);
4241 4241
@@ -4264,7 +4264,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
4264 4264
4265*******************************************************************************/ 4265*******************************************************************************/
4266#define CsrWifiSmeWpsConfigurationReqCreate(msg__, dst__, src__, wpsConfig__) \ 4266#define CsrWifiSmeWpsConfigurationReqCreate(msg__, dst__, src__, wpsConfig__) \
4267 msg__ = (CsrWifiSmeWpsConfigurationReq *) CsrPmemAlloc(sizeof(CsrWifiSmeWpsConfigurationReq)); \ 4267 msg__ = kmalloc(sizeof(CsrWifiSmeWpsConfigurationReq), GFP_KERNEL); \
4268 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_WPS_CONFIGURATION_REQ, dst__, src__); \ 4268 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_WPS_CONFIGURATION_REQ, dst__, src__); \
4269 msg__->wpsConfig = (wpsConfig__); 4269 msg__->wpsConfig = (wpsConfig__);
4270 4270
@@ -4292,7 +4292,7 @@ extern const char *CsrWifiSmeDownstreamPrimNames[CSR_WIFI_SME_PRIM_DOWNSTREAM_CO
4292 4292
4293*******************************************************************************/ 4293*******************************************************************************/
4294#define CsrWifiSmeWpsConfigurationCfmCreate(msg__, dst__, src__, status__) \ 4294#define CsrWifiSmeWpsConfigurationCfmCreate(msg__, dst__, src__, status__) \
4295 msg__ = (CsrWifiSmeWpsConfigurationCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeWpsConfigurationCfm)); \ 4295 msg__ = kmalloc(sizeof(CsrWifiSmeWpsConfigurationCfm), GFP_KERNEL); \
4296 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_WPS_CONFIGURATION_CFM, dst__, src__); \ 4296 CsrWifiFsmEventInit(&msg__->common, CSR_WIFI_SME_PRIM, CSR_WIFI_SME_WPS_CONFIGURATION_CFM, dst__, src__); \
4297 msg__->status = (status__); 4297 msg__->status = (status__);
4298 4298
diff --git a/drivers/staging/csr/csr_wifi_sme_serialize.c b/drivers/staging/csr/csr_wifi_sme_serialize.c
index 57b4cf060f70..a1db21189954 100644
--- a/drivers/staging/csr/csr_wifi_sme_serialize.c
+++ b/drivers/staging/csr/csr_wifi_sme_serialize.c
@@ -53,7 +53,7 @@ u8* CsrWifiSmeAdhocConfigSetReqSer(u8 *ptr, size_t *len, void *msg)
53 53
54void* CsrWifiSmeAdhocConfigSetReqDes(u8 *buffer, size_t length) 54void* CsrWifiSmeAdhocConfigSetReqDes(u8 *buffer, size_t length)
55{ 55{
56 CsrWifiSmeAdhocConfigSetReq *primitive = (CsrWifiSmeAdhocConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeAdhocConfigSetReq)); 56 CsrWifiSmeAdhocConfigSetReq *primitive = kmalloc(sizeof(CsrWifiSmeAdhocConfigSetReq), GFP_KERNEL);
57 size_t offset; 57 size_t offset;
58 offset = 0; 58 offset = 0;
59 59
@@ -108,7 +108,7 @@ u8* CsrWifiSmeBlacklistReqSer(u8 *ptr, size_t *len, void *msg)
108 108
109void* CsrWifiSmeBlacklistReqDes(u8 *buffer, size_t length) 109void* CsrWifiSmeBlacklistReqDes(u8 *buffer, size_t length)
110{ 110{
111 CsrWifiSmeBlacklistReq *primitive = (CsrWifiSmeBlacklistReq *) CsrPmemAlloc(sizeof(CsrWifiSmeBlacklistReq)); 111 CsrWifiSmeBlacklistReq *primitive = kmalloc(sizeof(CsrWifiSmeBlacklistReq), GFP_KERNEL);
112 size_t offset; 112 size_t offset;
113 offset = 0; 113 offset = 0;
114 114
@@ -119,7 +119,7 @@ void* CsrWifiSmeBlacklistReqDes(u8 *buffer, size_t length)
119 primitive->setAddresses = NULL; 119 primitive->setAddresses = NULL;
120 if (primitive->setAddressCount) 120 if (primitive->setAddressCount)
121 { 121 {
122 primitive->setAddresses = (CsrWifiMacAddress *)CsrPmemAlloc(sizeof(CsrWifiMacAddress) * primitive->setAddressCount); 122 primitive->setAddresses = kmalloc(sizeof(CsrWifiMacAddress) * primitive->setAddressCount, GFP_KERNEL);
123 } 123 }
124 { 124 {
125 u16 i1; 125 u16 i1;
@@ -169,7 +169,7 @@ u8* CsrWifiSmeCalibrationDataSetReqSer(u8 *ptr, size_t *len, void *msg)
169 169
170void* CsrWifiSmeCalibrationDataSetReqDes(u8 *buffer, size_t length) 170void* CsrWifiSmeCalibrationDataSetReqDes(u8 *buffer, size_t length)
171{ 171{
172 CsrWifiSmeCalibrationDataSetReq *primitive = (CsrWifiSmeCalibrationDataSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeCalibrationDataSetReq)); 172 CsrWifiSmeCalibrationDataSetReq *primitive = kmalloc(sizeof(CsrWifiSmeCalibrationDataSetReq), GFP_KERNEL);
173 size_t offset; 173 size_t offset;
174 offset = 0; 174 offset = 0;
175 175
@@ -177,7 +177,7 @@ void* CsrWifiSmeCalibrationDataSetReqDes(u8 *buffer, size_t length)
177 CsrUint16Des((u16 *) &primitive->calibrationDataLength, buffer, &offset); 177 CsrUint16Des((u16 *) &primitive->calibrationDataLength, buffer, &offset);
178 if (primitive->calibrationDataLength) 178 if (primitive->calibrationDataLength)
179 { 179 {
180 primitive->calibrationData = (u8 *)CsrPmemAlloc(primitive->calibrationDataLength); 180 primitive->calibrationData = kmalloc(primitive->calibrationDataLength, GFP_KERNEL);
181 CsrMemCpyDes(primitive->calibrationData, buffer, &offset, ((u16) (primitive->calibrationDataLength))); 181 CsrMemCpyDes(primitive->calibrationData, buffer, &offset, ((u16) (primitive->calibrationDataLength)));
182 } 182 }
183 else 183 else
@@ -227,7 +227,7 @@ u8* CsrWifiSmeCcxConfigSetReqSer(u8 *ptr, size_t *len, void *msg)
227 227
228void* CsrWifiSmeCcxConfigSetReqDes(u8 *buffer, size_t length) 228void* CsrWifiSmeCcxConfigSetReqDes(u8 *buffer, size_t length)
229{ 229{
230 CsrWifiSmeCcxConfigSetReq *primitive = (CsrWifiSmeCcxConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeCcxConfigSetReq)); 230 CsrWifiSmeCcxConfigSetReq *primitive = kmalloc(sizeof(CsrWifiSmeCcxConfigSetReq), GFP_KERNEL);
231 size_t offset; 231 size_t offset;
232 offset = 0; 232 offset = 0;
233 233
@@ -290,7 +290,7 @@ u8* CsrWifiSmeCoexConfigSetReqSer(u8 *ptr, size_t *len, void *msg)
290 290
291void* CsrWifiSmeCoexConfigSetReqDes(u8 *buffer, size_t length) 291void* CsrWifiSmeCoexConfigSetReqDes(u8 *buffer, size_t length)
292{ 292{
293 CsrWifiSmeCoexConfigSetReq *primitive = (CsrWifiSmeCoexConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeCoexConfigSetReq)); 293 CsrWifiSmeCoexConfigSetReq *primitive = kmalloc(sizeof(CsrWifiSmeCoexConfigSetReq), GFP_KERNEL);
294 size_t offset; 294 size_t offset;
295 offset = 0; 295 offset = 0;
296 296
@@ -366,7 +366,7 @@ u8* CsrWifiSmeConnectReqSer(u8 *ptr, size_t *len, void *msg)
366 366
367void* CsrWifiSmeConnectReqDes(u8 *buffer, size_t length) 367void* CsrWifiSmeConnectReqDes(u8 *buffer, size_t length)
368{ 368{
369 CsrWifiSmeConnectReq *primitive = (CsrWifiSmeConnectReq *) CsrPmemAlloc(sizeof(CsrWifiSmeConnectReq)); 369 CsrWifiSmeConnectReq *primitive = kmalloc(sizeof(CsrWifiSmeConnectReq), GFP_KERNEL);
370 size_t offset; 370 size_t offset;
371 offset = 0; 371 offset = 0;
372 372
@@ -383,7 +383,7 @@ void* CsrWifiSmeConnectReqDes(u8 *buffer, size_t length)
383 CsrUint16Des((u16 *) &primitive->connectionConfig.mlmeAssociateReqInformationElementsLength, buffer, &offset); 383 CsrUint16Des((u16 *) &primitive->connectionConfig.mlmeAssociateReqInformationElementsLength, buffer, &offset);
384 if (primitive->connectionConfig.mlmeAssociateReqInformationElementsLength) 384 if (primitive->connectionConfig.mlmeAssociateReqInformationElementsLength)
385 { 385 {
386 primitive->connectionConfig.mlmeAssociateReqInformationElements = (u8 *)CsrPmemAlloc(primitive->connectionConfig.mlmeAssociateReqInformationElementsLength); 386 primitive->connectionConfig.mlmeAssociateReqInformationElements = kmalloc(primitive->connectionConfig.mlmeAssociateReqInformationElementsLength, GFP_KERNEL);
387 CsrMemCpyDes(primitive->connectionConfig.mlmeAssociateReqInformationElements, buffer, &offset, ((u16) (primitive->connectionConfig.mlmeAssociateReqInformationElementsLength))); 387 CsrMemCpyDes(primitive->connectionConfig.mlmeAssociateReqInformationElements, buffer, &offset, ((u16) (primitive->connectionConfig.mlmeAssociateReqInformationElementsLength)));
388 } 388 }
389 else 389 else
@@ -432,7 +432,7 @@ u8* CsrWifiSmeHostConfigSetReqSer(u8 *ptr, size_t *len, void *msg)
432 432
433void* CsrWifiSmeHostConfigSetReqDes(u8 *buffer, size_t length) 433void* CsrWifiSmeHostConfigSetReqDes(u8 *buffer, size_t length)
434{ 434{
435 CsrWifiSmeHostConfigSetReq *primitive = (CsrWifiSmeHostConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeHostConfigSetReq)); 435 CsrWifiSmeHostConfigSetReq *primitive = kmalloc(sizeof(CsrWifiSmeHostConfigSetReq), GFP_KERNEL);
436 size_t offset; 436 size_t offset;
437 offset = 0; 437 offset = 0;
438 438
@@ -497,7 +497,7 @@ u8* CsrWifiSmeKeyReqSer(u8 *ptr, size_t *len, void *msg)
497 497
498void* CsrWifiSmeKeyReqDes(u8 *buffer, size_t length) 498void* CsrWifiSmeKeyReqDes(u8 *buffer, size_t length)
499{ 499{
500 CsrWifiSmeKeyReq *primitive = (CsrWifiSmeKeyReq *) CsrPmemAlloc(sizeof(CsrWifiSmeKeyReq)); 500 CsrWifiSmeKeyReq *primitive = kmalloc(sizeof(CsrWifiSmeKeyReq), GFP_KERNEL);
501 size_t offset; 501 size_t offset;
502 offset = 0; 502 offset = 0;
503 503
@@ -553,7 +553,7 @@ u8* CsrWifiSmeMibConfigSetReqSer(u8 *ptr, size_t *len, void *msg)
553 553
554void* CsrWifiSmeMibConfigSetReqDes(u8 *buffer, size_t length) 554void* CsrWifiSmeMibConfigSetReqDes(u8 *buffer, size_t length)
555{ 555{
556 CsrWifiSmeMibConfigSetReq *primitive = (CsrWifiSmeMibConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeMibConfigSetReq)); 556 CsrWifiSmeMibConfigSetReq *primitive = kmalloc(sizeof(CsrWifiSmeMibConfigSetReq), GFP_KERNEL);
557 size_t offset; 557 size_t offset;
558 offset = 0; 558 offset = 0;
559 559
@@ -596,7 +596,7 @@ u8* CsrWifiSmeMibGetNextReqSer(u8 *ptr, size_t *len, void *msg)
596 596
597void* CsrWifiSmeMibGetNextReqDes(u8 *buffer, size_t length) 597void* CsrWifiSmeMibGetNextReqDes(u8 *buffer, size_t length)
598{ 598{
599 CsrWifiSmeMibGetNextReq *primitive = (CsrWifiSmeMibGetNextReq *) CsrPmemAlloc(sizeof(CsrWifiSmeMibGetNextReq)); 599 CsrWifiSmeMibGetNextReq *primitive = kmalloc(sizeof(CsrWifiSmeMibGetNextReq), GFP_KERNEL);
600 size_t offset; 600 size_t offset;
601 offset = 0; 601 offset = 0;
602 602
@@ -604,7 +604,7 @@ void* CsrWifiSmeMibGetNextReqDes(u8 *buffer, size_t length)
604 CsrUint16Des((u16 *) &primitive->mibAttributeLength, buffer, &offset); 604 CsrUint16Des((u16 *) &primitive->mibAttributeLength, buffer, &offset);
605 if (primitive->mibAttributeLength) 605 if (primitive->mibAttributeLength)
606 { 606 {
607 primitive->mibAttribute = (u8 *)CsrPmemAlloc(primitive->mibAttributeLength); 607 primitive->mibAttribute = kmalloc(primitive->mibAttributeLength, GFP_KERNEL);
608 CsrMemCpyDes(primitive->mibAttribute, buffer, &offset, ((u16) (primitive->mibAttributeLength))); 608 CsrMemCpyDes(primitive->mibAttribute, buffer, &offset, ((u16) (primitive->mibAttributeLength)));
609 } 609 }
610 else 610 else
@@ -652,7 +652,7 @@ u8* CsrWifiSmeMibGetReqSer(u8 *ptr, size_t *len, void *msg)
652 652
653void* CsrWifiSmeMibGetReqDes(u8 *buffer, size_t length) 653void* CsrWifiSmeMibGetReqDes(u8 *buffer, size_t length)
654{ 654{
655 CsrWifiSmeMibGetReq *primitive = (CsrWifiSmeMibGetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeMibGetReq)); 655 CsrWifiSmeMibGetReq *primitive = kmalloc(sizeof(CsrWifiSmeMibGetReq), GFP_KERNEL);
656 size_t offset; 656 size_t offset;
657 offset = 0; 657 offset = 0;
658 658
@@ -660,7 +660,7 @@ void* CsrWifiSmeMibGetReqDes(u8 *buffer, size_t length)
660 CsrUint16Des((u16 *) &primitive->mibAttributeLength, buffer, &offset); 660 CsrUint16Des((u16 *) &primitive->mibAttributeLength, buffer, &offset);
661 if (primitive->mibAttributeLength) 661 if (primitive->mibAttributeLength)
662 { 662 {
663 primitive->mibAttribute = (u8 *)CsrPmemAlloc(primitive->mibAttributeLength); 663 primitive->mibAttribute = kmalloc(primitive->mibAttributeLength, GFP_KERNEL);
664 CsrMemCpyDes(primitive->mibAttribute, buffer, &offset, ((u16) (primitive->mibAttributeLength))); 664 CsrMemCpyDes(primitive->mibAttribute, buffer, &offset, ((u16) (primitive->mibAttributeLength)));
665 } 665 }
666 else 666 else
@@ -708,7 +708,7 @@ u8* CsrWifiSmeMibSetReqSer(u8 *ptr, size_t *len, void *msg)
708 708
709void* CsrWifiSmeMibSetReqDes(u8 *buffer, size_t length) 709void* CsrWifiSmeMibSetReqDes(u8 *buffer, size_t length)
710{ 710{
711 CsrWifiSmeMibSetReq *primitive = (CsrWifiSmeMibSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeMibSetReq)); 711 CsrWifiSmeMibSetReq *primitive = kmalloc(sizeof(CsrWifiSmeMibSetReq), GFP_KERNEL);
712 size_t offset; 712 size_t offset;
713 offset = 0; 713 offset = 0;
714 714
@@ -716,7 +716,7 @@ void* CsrWifiSmeMibSetReqDes(u8 *buffer, size_t length)
716 CsrUint16Des((u16 *) &primitive->mibAttributeLength, buffer, &offset); 716 CsrUint16Des((u16 *) &primitive->mibAttributeLength, buffer, &offset);
717 if (primitive->mibAttributeLength) 717 if (primitive->mibAttributeLength)
718 { 718 {
719 primitive->mibAttribute = (u8 *)CsrPmemAlloc(primitive->mibAttributeLength); 719 primitive->mibAttribute = kmalloc(primitive->mibAttributeLength, GFP_KERNEL);
720 CsrMemCpyDes(primitive->mibAttribute, buffer, &offset, ((u16) (primitive->mibAttributeLength))); 720 CsrMemCpyDes(primitive->mibAttribute, buffer, &offset, ((u16) (primitive->mibAttributeLength)));
721 } 721 }
722 else 722 else
@@ -777,7 +777,7 @@ u8* CsrWifiSmeMulticastAddressReqSer(u8 *ptr, size_t *len, void *msg)
777 777
778void* CsrWifiSmeMulticastAddressReqDes(u8 *buffer, size_t length) 778void* CsrWifiSmeMulticastAddressReqDes(u8 *buffer, size_t length)
779{ 779{
780 CsrWifiSmeMulticastAddressReq *primitive = (CsrWifiSmeMulticastAddressReq *) CsrPmemAlloc(sizeof(CsrWifiSmeMulticastAddressReq)); 780 CsrWifiSmeMulticastAddressReq *primitive = kmalloc(sizeof(CsrWifiSmeMulticastAddressReq), GFP_KERNEL);
781 size_t offset; 781 size_t offset;
782 offset = 0; 782 offset = 0;
783 783
@@ -788,7 +788,7 @@ void* CsrWifiSmeMulticastAddressReqDes(u8 *buffer, size_t length)
788 primitive->setAddresses = NULL; 788 primitive->setAddresses = NULL;
789 if (primitive->setAddressesCount) 789 if (primitive->setAddressesCount)
790 { 790 {
791 primitive->setAddresses = (CsrWifiMacAddress *)CsrPmemAlloc(sizeof(CsrWifiMacAddress) * primitive->setAddressesCount); 791 primitive->setAddresses = kmalloc(sizeof(CsrWifiMacAddress) * primitive->setAddressesCount, GFP_KERNEL);
792 } 792 }
793 { 793 {
794 u16 i1; 794 u16 i1;
@@ -844,7 +844,7 @@ u8* CsrWifiSmePacketFilterSetReqSer(u8 *ptr, size_t *len, void *msg)
844 844
845void* CsrWifiSmePacketFilterSetReqDes(u8 *buffer, size_t length) 845void* CsrWifiSmePacketFilterSetReqDes(u8 *buffer, size_t length)
846{ 846{
847 CsrWifiSmePacketFilterSetReq *primitive = (CsrWifiSmePacketFilterSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmePacketFilterSetReq)); 847 CsrWifiSmePacketFilterSetReq *primitive = kmalloc(sizeof(CsrWifiSmePacketFilterSetReq), GFP_KERNEL);
848 size_t offset; 848 size_t offset;
849 offset = 0; 849 offset = 0;
850 850
@@ -853,7 +853,7 @@ void* CsrWifiSmePacketFilterSetReqDes(u8 *buffer, size_t length)
853 CsrUint16Des((u16 *) &primitive->filterLength, buffer, &offset); 853 CsrUint16Des((u16 *) &primitive->filterLength, buffer, &offset);
854 if (primitive->filterLength) 854 if (primitive->filterLength)
855 { 855 {
856 primitive->filter = (u8 *)CsrPmemAlloc(primitive->filterLength); 856 primitive->filter = kmalloc(primitive->filterLength, GFP_KERNEL);
857 CsrMemCpyDes(primitive->filter, buffer, &offset, ((u16) (primitive->filterLength))); 857 CsrMemCpyDes(primitive->filter, buffer, &offset, ((u16) (primitive->filterLength)));
858 } 858 }
859 else 859 else
@@ -918,7 +918,7 @@ u8* CsrWifiSmePmkidReqSer(u8 *ptr, size_t *len, void *msg)
918 918
919void* CsrWifiSmePmkidReqDes(u8 *buffer, size_t length) 919void* CsrWifiSmePmkidReqDes(u8 *buffer, size_t length)
920{ 920{
921 CsrWifiSmePmkidReq *primitive = (CsrWifiSmePmkidReq *) CsrPmemAlloc(sizeof(CsrWifiSmePmkidReq)); 921 CsrWifiSmePmkidReq *primitive = kmalloc(sizeof(CsrWifiSmePmkidReq), GFP_KERNEL);
922 size_t offset; 922 size_t offset;
923 offset = 0; 923 offset = 0;
924 924
@@ -929,7 +929,7 @@ void* CsrWifiSmePmkidReqDes(u8 *buffer, size_t length)
929 primitive->setPmkids = NULL; 929 primitive->setPmkids = NULL;
930 if (primitive->setPmkidsCount) 930 if (primitive->setPmkidsCount)
931 { 931 {
932 primitive->setPmkids = (CsrWifiSmePmkid *)CsrPmemAlloc(sizeof(CsrWifiSmePmkid) * primitive->setPmkidsCount); 932 primitive->setPmkids = kmalloc(sizeof(CsrWifiSmePmkid) * primitive->setPmkidsCount, GFP_KERNEL);
933 } 933 }
934 { 934 {
935 u16 i1; 935 u16 i1;
@@ -986,7 +986,7 @@ u8* CsrWifiSmePowerConfigSetReqSer(u8 *ptr, size_t *len, void *msg)
986 986
987void* CsrWifiSmePowerConfigSetReqDes(u8 *buffer, size_t length) 987void* CsrWifiSmePowerConfigSetReqDes(u8 *buffer, size_t length)
988{ 988{
989 CsrWifiSmePowerConfigSetReq *primitive = (CsrWifiSmePowerConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmePowerConfigSetReq)); 989 CsrWifiSmePowerConfigSetReq *primitive = kmalloc(sizeof(CsrWifiSmePowerConfigSetReq), GFP_KERNEL);
990 size_t offset; 990 size_t offset;
991 offset = 0; 991 offset = 0;
992 992
@@ -1077,7 +1077,7 @@ u8* CsrWifiSmeRoamingConfigSetReqSer(u8 *ptr, size_t *len, void *msg)
1077 1077
1078void* CsrWifiSmeRoamingConfigSetReqDes(u8 *buffer, size_t length) 1078void* CsrWifiSmeRoamingConfigSetReqDes(u8 *buffer, size_t length)
1079{ 1079{
1080 CsrWifiSmeRoamingConfigSetReq *primitive = (CsrWifiSmeRoamingConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeRoamingConfigSetReq)); 1080 CsrWifiSmeRoamingConfigSetReq *primitive = kmalloc(sizeof(CsrWifiSmeRoamingConfigSetReq), GFP_KERNEL);
1081 size_t offset; 1081 size_t offset;
1082 offset = 0; 1082 offset = 0;
1083 1083
@@ -1182,7 +1182,7 @@ u8* CsrWifiSmeScanConfigSetReqSer(u8 *ptr, size_t *len, void *msg)
1182 1182
1183void* CsrWifiSmeScanConfigSetReqDes(u8 *buffer, size_t length) 1183void* CsrWifiSmeScanConfigSetReqDes(u8 *buffer, size_t length)
1184{ 1184{
1185 CsrWifiSmeScanConfigSetReq *primitive = (CsrWifiSmeScanConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeScanConfigSetReq)); 1185 CsrWifiSmeScanConfigSetReq *primitive = kmalloc(sizeof(CsrWifiSmeScanConfigSetReq), GFP_KERNEL);
1186 size_t offset; 1186 size_t offset;
1187 offset = 0; 1187 offset = 0;
1188 1188
@@ -1210,7 +1210,7 @@ void* CsrWifiSmeScanConfigSetReqDes(u8 *buffer, size_t length)
1210 CsrUint16Des((u16 *) &primitive->scanConfig.passiveChannelListCount, buffer, &offset); 1210 CsrUint16Des((u16 *) &primitive->scanConfig.passiveChannelListCount, buffer, &offset);
1211 if (primitive->scanConfig.passiveChannelListCount) 1211 if (primitive->scanConfig.passiveChannelListCount)
1212 { 1212 {
1213 primitive->scanConfig.passiveChannelList = (u8 *)CsrPmemAlloc(primitive->scanConfig.passiveChannelListCount); 1213 primitive->scanConfig.passiveChannelList = kmalloc(primitive->scanConfig.passiveChannelListCount, GFP_KERNEL);
1214 CsrMemCpyDes(primitive->scanConfig.passiveChannelList, buffer, &offset, ((u16) (primitive->scanConfig.passiveChannelListCount))); 1214 CsrMemCpyDes(primitive->scanConfig.passiveChannelList, buffer, &offset, ((u16) (primitive->scanConfig.passiveChannelListCount)));
1215 } 1215 }
1216 else 1216 else
@@ -1291,7 +1291,7 @@ u8* CsrWifiSmeScanFullReqSer(u8 *ptr, size_t *len, void *msg)
1291 1291
1292void* CsrWifiSmeScanFullReqDes(u8 *buffer, size_t length) 1292void* CsrWifiSmeScanFullReqDes(u8 *buffer, size_t length)
1293{ 1293{
1294 CsrWifiSmeScanFullReq *primitive = (CsrWifiSmeScanFullReq *) CsrPmemAlloc(sizeof(CsrWifiSmeScanFullReq)); 1294 CsrWifiSmeScanFullReq *primitive = kmalloc(sizeof(CsrWifiSmeScanFullReq), GFP_KERNEL);
1295 size_t offset; 1295 size_t offset;
1296 offset = 0; 1296 offset = 0;
1297 1297
@@ -1300,7 +1300,7 @@ void* CsrWifiSmeScanFullReqDes(u8 *buffer, size_t length)
1300 primitive->ssid = NULL; 1300 primitive->ssid = NULL;
1301 if (primitive->ssidCount) 1301 if (primitive->ssidCount)
1302 { 1302 {
1303 primitive->ssid = (CsrWifiSsid *)CsrPmemAlloc(sizeof(CsrWifiSsid) * primitive->ssidCount); 1303 primitive->ssid = kmalloc(sizeof(CsrWifiSsid) * primitive->ssidCount, GFP_KERNEL);
1304 } 1304 }
1305 { 1305 {
1306 u16 i1; 1306 u16 i1;
@@ -1317,7 +1317,7 @@ void* CsrWifiSmeScanFullReqDes(u8 *buffer, size_t length)
1317 CsrUint16Des((u16 *) &primitive->channelListCount, buffer, &offset); 1317 CsrUint16Des((u16 *) &primitive->channelListCount, buffer, &offset);
1318 if (primitive->channelListCount) 1318 if (primitive->channelListCount)
1319 { 1319 {
1320 primitive->channelList = (u8 *)CsrPmemAlloc(primitive->channelListCount); 1320 primitive->channelList = kmalloc(primitive->channelListCount, GFP_KERNEL);
1321 CsrMemCpyDes(primitive->channelList, buffer, &offset, ((u16) (primitive->channelListCount))); 1321 CsrMemCpyDes(primitive->channelList, buffer, &offset, ((u16) (primitive->channelListCount)));
1322 } 1322 }
1323 else 1323 else
@@ -1327,7 +1327,7 @@ void* CsrWifiSmeScanFullReqDes(u8 *buffer, size_t length)
1327 CsrUint16Des((u16 *) &primitive->probeIeLength, buffer, &offset); 1327 CsrUint16Des((u16 *) &primitive->probeIeLength, buffer, &offset);
1328 if (primitive->probeIeLength) 1328 if (primitive->probeIeLength)
1329 { 1329 {
1330 primitive->probeIe = (u8 *)CsrPmemAlloc(primitive->probeIeLength); 1330 primitive->probeIe = kmalloc(primitive->probeIeLength, GFP_KERNEL);
1331 CsrMemCpyDes(primitive->probeIe, buffer, &offset, ((u16) (primitive->probeIeLength))); 1331 CsrMemCpyDes(primitive->probeIe, buffer, &offset, ((u16) (primitive->probeIeLength)));
1332 } 1332 }
1333 else 1333 else
@@ -1383,7 +1383,7 @@ u8* CsrWifiSmeSmeStaConfigSetReqSer(u8 *ptr, size_t *len, void *msg)
1383 1383
1384void* CsrWifiSmeSmeStaConfigSetReqDes(u8 *buffer, size_t length) 1384void* CsrWifiSmeSmeStaConfigSetReqDes(u8 *buffer, size_t length)
1385{ 1385{
1386 CsrWifiSmeSmeStaConfigSetReq *primitive = (CsrWifiSmeSmeStaConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeSmeStaConfigSetReq)); 1386 CsrWifiSmeSmeStaConfigSetReq *primitive = kmalloc(sizeof(CsrWifiSmeSmeStaConfigSetReq), GFP_KERNEL);
1387 size_t offset; 1387 size_t offset;
1388 offset = 0; 1388 offset = 0;
1389 1389
@@ -1445,7 +1445,7 @@ u8* CsrWifiSmeTspecReqSer(u8 *ptr, size_t *len, void *msg)
1445 1445
1446void* CsrWifiSmeTspecReqDes(u8 *buffer, size_t length) 1446void* CsrWifiSmeTspecReqDes(u8 *buffer, size_t length)
1447{ 1447{
1448 CsrWifiSmeTspecReq *primitive = (CsrWifiSmeTspecReq *) CsrPmemAlloc(sizeof(CsrWifiSmeTspecReq)); 1448 CsrWifiSmeTspecReq *primitive = kmalloc(sizeof(CsrWifiSmeTspecReq), GFP_KERNEL);
1449 size_t offset; 1449 size_t offset;
1450 offset = 0; 1450 offset = 0;
1451 1451
@@ -1458,7 +1458,7 @@ void* CsrWifiSmeTspecReqDes(u8 *buffer, size_t length)
1458 CsrUint16Des((u16 *) &primitive->tspecLength, buffer, &offset); 1458 CsrUint16Des((u16 *) &primitive->tspecLength, buffer, &offset);
1459 if (primitive->tspecLength) 1459 if (primitive->tspecLength)
1460 { 1460 {
1461 primitive->tspec = (u8 *)CsrPmemAlloc(primitive->tspecLength); 1461 primitive->tspec = kmalloc(primitive->tspecLength, GFP_KERNEL);
1462 CsrMemCpyDes(primitive->tspec, buffer, &offset, ((u16) (primitive->tspecLength))); 1462 CsrMemCpyDes(primitive->tspec, buffer, &offset, ((u16) (primitive->tspecLength)));
1463 } 1463 }
1464 else 1464 else
@@ -1468,7 +1468,7 @@ void* CsrWifiSmeTspecReqDes(u8 *buffer, size_t length)
1468 CsrUint16Des((u16 *) &primitive->tclasLength, buffer, &offset); 1468 CsrUint16Des((u16 *) &primitive->tclasLength, buffer, &offset);
1469 if (primitive->tclasLength) 1469 if (primitive->tclasLength)
1470 { 1470 {
1471 primitive->tclas = (u8 *)CsrPmemAlloc(primitive->tclasLength); 1471 primitive->tclas = kmalloc(primitive->tclasLength, GFP_KERNEL);
1472 CsrMemCpyDes(primitive->tclas, buffer, &offset, ((u16) (primitive->tclasLength))); 1472 CsrMemCpyDes(primitive->tclas, buffer, &offset, ((u16) (primitive->tclasLength)));
1473 } 1473 }
1474 else 1474 else
@@ -1533,7 +1533,7 @@ u8* CsrWifiSmeWifiFlightmodeReqSer(u8 *ptr, size_t *len, void *msg)
1533 1533
1534void* CsrWifiSmeWifiFlightmodeReqDes(u8 *buffer, size_t length) 1534void* CsrWifiSmeWifiFlightmodeReqDes(u8 *buffer, size_t length)
1535{ 1535{
1536 CsrWifiSmeWifiFlightmodeReq *primitive = (CsrWifiSmeWifiFlightmodeReq *) CsrPmemAlloc(sizeof(CsrWifiSmeWifiFlightmodeReq)); 1536 CsrWifiSmeWifiFlightmodeReq *primitive = kmalloc(sizeof(CsrWifiSmeWifiFlightmodeReq), GFP_KERNEL);
1537 size_t offset; 1537 size_t offset;
1538 offset = 0; 1538 offset = 0;
1539 1539
@@ -1543,7 +1543,7 @@ void* CsrWifiSmeWifiFlightmodeReqDes(u8 *buffer, size_t length)
1543 primitive->mibFiles = NULL; 1543 primitive->mibFiles = NULL;
1544 if (primitive->mibFilesCount) 1544 if (primitive->mibFilesCount)
1545 { 1545 {
1546 primitive->mibFiles = (CsrWifiSmeDataBlock *)CsrPmemAlloc(sizeof(CsrWifiSmeDataBlock) * primitive->mibFilesCount); 1546 primitive->mibFiles = kmalloc(sizeof(CsrWifiSmeDataBlock) * primitive->mibFilesCount, GFP_KERNEL);
1547 } 1547 }
1548 { 1548 {
1549 u16 i1; 1549 u16 i1;
@@ -1552,7 +1552,7 @@ void* CsrWifiSmeWifiFlightmodeReqDes(u8 *buffer, size_t length)
1552 CsrUint16Des((u16 *) &primitive->mibFiles[i1].length, buffer, &offset); 1552 CsrUint16Des((u16 *) &primitive->mibFiles[i1].length, buffer, &offset);
1553 if (primitive->mibFiles[i1].length) 1553 if (primitive->mibFiles[i1].length)
1554 { 1554 {
1555 primitive->mibFiles[i1].data = (u8 *)CsrPmemAlloc(primitive->mibFiles[i1].length); 1555 primitive->mibFiles[i1].data = kmalloc(primitive->mibFiles[i1].length, GFP_KERNEL);
1556 CsrMemCpyDes(primitive->mibFiles[i1].data, buffer, &offset, ((u16) (primitive->mibFiles[i1].length))); 1556 CsrMemCpyDes(primitive->mibFiles[i1].data, buffer, &offset, ((u16) (primitive->mibFiles[i1].length)));
1557 } 1557 }
1558 else 1558 else
@@ -1625,7 +1625,7 @@ u8* CsrWifiSmeWifiOnReqSer(u8 *ptr, size_t *len, void *msg)
1625 1625
1626void* CsrWifiSmeWifiOnReqDes(u8 *buffer, size_t length) 1626void* CsrWifiSmeWifiOnReqDes(u8 *buffer, size_t length)
1627{ 1627{
1628 CsrWifiSmeWifiOnReq *primitive = (CsrWifiSmeWifiOnReq *) CsrPmemAlloc(sizeof(CsrWifiSmeWifiOnReq)); 1628 CsrWifiSmeWifiOnReq *primitive = kmalloc(sizeof(CsrWifiSmeWifiOnReq), GFP_KERNEL);
1629 size_t offset; 1629 size_t offset;
1630 offset = 0; 1630 offset = 0;
1631 1631
@@ -1635,7 +1635,7 @@ void* CsrWifiSmeWifiOnReqDes(u8 *buffer, size_t length)
1635 primitive->mibFiles = NULL; 1635 primitive->mibFiles = NULL;
1636 if (primitive->mibFilesCount) 1636 if (primitive->mibFilesCount)
1637 { 1637 {
1638 primitive->mibFiles = (CsrWifiSmeDataBlock *)CsrPmemAlloc(sizeof(CsrWifiSmeDataBlock) * primitive->mibFilesCount); 1638 primitive->mibFiles = kmalloc(sizeof(CsrWifiSmeDataBlock) * primitive->mibFilesCount, GFP_KERNEL);
1639 } 1639 }
1640 { 1640 {
1641 u16 i1; 1641 u16 i1;
@@ -1644,7 +1644,7 @@ void* CsrWifiSmeWifiOnReqDes(u8 *buffer, size_t length)
1644 CsrUint16Des((u16 *) &primitive->mibFiles[i1].length, buffer, &offset); 1644 CsrUint16Des((u16 *) &primitive->mibFiles[i1].length, buffer, &offset);
1645 if (primitive->mibFiles[i1].length) 1645 if (primitive->mibFiles[i1].length)
1646 { 1646 {
1647 primitive->mibFiles[i1].data = (u8 *)CsrPmemAlloc(primitive->mibFiles[i1].length); 1647 primitive->mibFiles[i1].data = kmalloc(primitive->mibFiles[i1].length, GFP_KERNEL);
1648 CsrMemCpyDes(primitive->mibFiles[i1].data, buffer, &offset, ((u16) (primitive->mibFiles[i1].length))); 1648 CsrMemCpyDes(primitive->mibFiles[i1].data, buffer, &offset, ((u16) (primitive->mibFiles[i1].length)));
1649 } 1649 }
1650 else 1650 else
@@ -1712,7 +1712,7 @@ u8* CsrWifiSmeCloakedSsidsSetReqSer(u8 *ptr, size_t *len, void *msg)
1712 1712
1713void* CsrWifiSmeCloakedSsidsSetReqDes(u8 *buffer, size_t length) 1713void* CsrWifiSmeCloakedSsidsSetReqDes(u8 *buffer, size_t length)
1714{ 1714{
1715 CsrWifiSmeCloakedSsidsSetReq *primitive = (CsrWifiSmeCloakedSsidsSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeCloakedSsidsSetReq)); 1715 CsrWifiSmeCloakedSsidsSetReq *primitive = kmalloc(sizeof(CsrWifiSmeCloakedSsidsSetReq), GFP_KERNEL);
1716 size_t offset; 1716 size_t offset;
1717 offset = 0; 1717 offset = 0;
1718 1718
@@ -1721,7 +1721,7 @@ void* CsrWifiSmeCloakedSsidsSetReqDes(u8 *buffer, size_t length)
1721 primitive->cloakedSsids.cloakedSsids = NULL; 1721 primitive->cloakedSsids.cloakedSsids = NULL;
1722 if (primitive->cloakedSsids.cloakedSsidsCount) 1722 if (primitive->cloakedSsids.cloakedSsidsCount)
1723 { 1723 {
1724 primitive->cloakedSsids.cloakedSsids = (CsrWifiSsid *)CsrPmemAlloc(sizeof(CsrWifiSsid) * primitive->cloakedSsids.cloakedSsidsCount); 1724 primitive->cloakedSsids.cloakedSsids = kmalloc(sizeof(CsrWifiSsid) * primitive->cloakedSsids.cloakedSsidsCount, GFP_KERNEL);
1725 } 1725 }
1726 { 1726 {
1727 u16 i2; 1727 u16 i2;
@@ -1772,7 +1772,7 @@ u8* CsrWifiSmeSmeCommonConfigSetReqSer(u8 *ptr, size_t *len, void *msg)
1772 1772
1773void* CsrWifiSmeSmeCommonConfigSetReqDes(u8 *buffer, size_t length) 1773void* CsrWifiSmeSmeCommonConfigSetReqDes(u8 *buffer, size_t length)
1774{ 1774{
1775 CsrWifiSmeSmeCommonConfigSetReq *primitive = (CsrWifiSmeSmeCommonConfigSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeSmeCommonConfigSetReq)); 1775 CsrWifiSmeSmeCommonConfigSetReq *primitive = kmalloc(sizeof(CsrWifiSmeSmeCommonConfigSetReq), GFP_KERNEL);
1776 size_t offset; 1776 size_t offset;
1777 offset = 0; 1777 offset = 0;
1778 1778
@@ -1853,7 +1853,7 @@ u8* CsrWifiSmeWpsConfigurationReqSer(u8 *ptr, size_t *len, void *msg)
1853 1853
1854void* CsrWifiSmeWpsConfigurationReqDes(u8 *buffer, size_t length) 1854void* CsrWifiSmeWpsConfigurationReqDes(u8 *buffer, size_t length)
1855{ 1855{
1856 CsrWifiSmeWpsConfigurationReq *primitive = (CsrWifiSmeWpsConfigurationReq *) CsrPmemAlloc(sizeof(CsrWifiSmeWpsConfigurationReq)); 1856 CsrWifiSmeWpsConfigurationReq *primitive = kmalloc(sizeof(CsrWifiSmeWpsConfigurationReq), GFP_KERNEL);
1857 size_t offset; 1857 size_t offset;
1858 offset = 0; 1858 offset = 0;
1859 1859
@@ -1874,7 +1874,7 @@ void* CsrWifiSmeWpsConfigurationReqDes(u8 *buffer, size_t length)
1874 primitive->wpsConfig.secondaryDeviceType = NULL; 1874 primitive->wpsConfig.secondaryDeviceType = NULL;
1875 if (primitive->wpsConfig.secondaryDeviceTypeCount) 1875 if (primitive->wpsConfig.secondaryDeviceTypeCount)
1876 { 1876 {
1877 primitive->wpsConfig.secondaryDeviceType = (CsrWifiSmeWpsDeviceType *)CsrPmemAlloc(sizeof(CsrWifiSmeWpsDeviceType) * primitive->wpsConfig.secondaryDeviceTypeCount); 1877 primitive->wpsConfig.secondaryDeviceType = kmalloc(sizeof(CsrWifiSmeWpsDeviceType) * primitive->wpsConfig.secondaryDeviceTypeCount, GFP_KERNEL);
1878 } 1878 }
1879 { 1879 {
1880 u16 i2; 1880 u16 i2;
@@ -1927,7 +1927,7 @@ u8* CsrWifiSmeSetReqSer(u8 *ptr, size_t *len, void *msg)
1927 1927
1928void* CsrWifiSmeSetReqDes(u8 *buffer, size_t length) 1928void* CsrWifiSmeSetReqDes(u8 *buffer, size_t length)
1929{ 1929{
1930 CsrWifiSmeSetReq *primitive = (CsrWifiSmeSetReq *) CsrPmemAlloc(sizeof(CsrWifiSmeSetReq)); 1930 CsrWifiSmeSetReq *primitive = kmalloc(sizeof(CsrWifiSmeSetReq), GFP_KERNEL);
1931 size_t offset; 1931 size_t offset;
1932 offset = 0; 1932 offset = 0;
1933 1933
@@ -1935,7 +1935,7 @@ void* CsrWifiSmeSetReqDes(u8 *buffer, size_t length)
1935 CsrUint32Des((u32 *) &primitive->dataLength, buffer, &offset); 1935 CsrUint32Des((u32 *) &primitive->dataLength, buffer, &offset);
1936 if (primitive->dataLength) 1936 if (primitive->dataLength)
1937 { 1937 {
1938 primitive->data = (u8 *)CsrPmemAlloc(primitive->dataLength); 1938 primitive->data = kmalloc(primitive->dataLength, GFP_KERNEL);
1939 CsrMemCpyDes(primitive->data, buffer, &offset, ((u16) (primitive->dataLength))); 1939 CsrMemCpyDes(primitive->data, buffer, &offset, ((u16) (primitive->dataLength)));
1940 } 1940 }
1941 else 1941 else
@@ -1985,7 +1985,7 @@ u8* CsrWifiSmeAdhocConfigGetCfmSer(u8 *ptr, size_t *len, void *msg)
1985 1985
1986void* CsrWifiSmeAdhocConfigGetCfmDes(u8 *buffer, size_t length) 1986void* CsrWifiSmeAdhocConfigGetCfmDes(u8 *buffer, size_t length)
1987{ 1987{
1988 CsrWifiSmeAdhocConfigGetCfm *primitive = (CsrWifiSmeAdhocConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeAdhocConfigGetCfm)); 1988 CsrWifiSmeAdhocConfigGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeAdhocConfigGetCfm), GFP_KERNEL);
1989 size_t offset; 1989 size_t offset;
1990 offset = 0; 1990 offset = 0;
1991 1991
@@ -2107,7 +2107,7 @@ u8* CsrWifiSmeAssociationCompleteIndSer(u8 *ptr, size_t *len, void *msg)
2107 2107
2108void* CsrWifiSmeAssociationCompleteIndDes(u8 *buffer, size_t length) 2108void* CsrWifiSmeAssociationCompleteIndDes(u8 *buffer, size_t length)
2109{ 2109{
2110 CsrWifiSmeAssociationCompleteInd *primitive = (CsrWifiSmeAssociationCompleteInd *) CsrPmemAlloc(sizeof(CsrWifiSmeAssociationCompleteInd)); 2110 CsrWifiSmeAssociationCompleteInd *primitive = kmalloc(sizeof(CsrWifiSmeAssociationCompleteInd), GFP_KERNEL);
2111 size_t offset; 2111 size_t offset;
2112 offset = 0; 2112 offset = 0;
2113 2113
@@ -2130,7 +2130,7 @@ void* CsrWifiSmeAssociationCompleteIndDes(u8 *buffer, size_t length)
2130 CsrUint16Des((u16 *) &primitive->connectionInfo.beaconFrameLength, buffer, &offset); 2130 CsrUint16Des((u16 *) &primitive->connectionInfo.beaconFrameLength, buffer, &offset);
2131 if (primitive->connectionInfo.beaconFrameLength) 2131 if (primitive->connectionInfo.beaconFrameLength)
2132 { 2132 {
2133 primitive->connectionInfo.beaconFrame = (u8 *)CsrPmemAlloc(primitive->connectionInfo.beaconFrameLength); 2133 primitive->connectionInfo.beaconFrame = kmalloc(primitive->connectionInfo.beaconFrameLength, GFP_KERNEL);
2134 CsrMemCpyDes(primitive->connectionInfo.beaconFrame, buffer, &offset, ((u16) (primitive->connectionInfo.beaconFrameLength))); 2134 CsrMemCpyDes(primitive->connectionInfo.beaconFrame, buffer, &offset, ((u16) (primitive->connectionInfo.beaconFrameLength)));
2135 } 2135 }
2136 else 2136 else
@@ -2140,7 +2140,7 @@ void* CsrWifiSmeAssociationCompleteIndDes(u8 *buffer, size_t length)
2140 CsrUint16Des((u16 *) &primitive->connectionInfo.associationReqFrameLength, buffer, &offset); 2140 CsrUint16Des((u16 *) &primitive->connectionInfo.associationReqFrameLength, buffer, &offset);
2141 if (primitive->connectionInfo.associationReqFrameLength) 2141 if (primitive->connectionInfo.associationReqFrameLength)
2142 { 2142 {
2143 primitive->connectionInfo.associationReqFrame = (u8 *)CsrPmemAlloc(primitive->connectionInfo.associationReqFrameLength); 2143 primitive->connectionInfo.associationReqFrame = kmalloc(primitive->connectionInfo.associationReqFrameLength, GFP_KERNEL);
2144 CsrMemCpyDes(primitive->connectionInfo.associationReqFrame, buffer, &offset, ((u16) (primitive->connectionInfo.associationReqFrameLength))); 2144 CsrMemCpyDes(primitive->connectionInfo.associationReqFrame, buffer, &offset, ((u16) (primitive->connectionInfo.associationReqFrameLength)));
2145 } 2145 }
2146 else 2146 else
@@ -2150,7 +2150,7 @@ void* CsrWifiSmeAssociationCompleteIndDes(u8 *buffer, size_t length)
2150 CsrUint16Des((u16 *) &primitive->connectionInfo.associationRspFrameLength, buffer, &offset); 2150 CsrUint16Des((u16 *) &primitive->connectionInfo.associationRspFrameLength, buffer, &offset);
2151 if (primitive->connectionInfo.associationRspFrameLength) 2151 if (primitive->connectionInfo.associationRspFrameLength)
2152 { 2152 {
2153 primitive->connectionInfo.associationRspFrame = (u8 *)CsrPmemAlloc(primitive->connectionInfo.associationRspFrameLength); 2153 primitive->connectionInfo.associationRspFrame = kmalloc(primitive->connectionInfo.associationRspFrameLength, GFP_KERNEL);
2154 CsrMemCpyDes(primitive->connectionInfo.associationRspFrame, buffer, &offset, ((u16) (primitive->connectionInfo.associationRspFrameLength))); 2154 CsrMemCpyDes(primitive->connectionInfo.associationRspFrame, buffer, &offset, ((u16) (primitive->connectionInfo.associationRspFrameLength)));
2155 } 2155 }
2156 else 2156 else
@@ -2160,7 +2160,7 @@ void* CsrWifiSmeAssociationCompleteIndDes(u8 *buffer, size_t length)
2160 CsrUint16Des((u16 *) &primitive->connectionInfo.assocScanInfoElementsLength, buffer, &offset); 2160 CsrUint16Des((u16 *) &primitive->connectionInfo.assocScanInfoElementsLength, buffer, &offset);
2161 if (primitive->connectionInfo.assocScanInfoElementsLength) 2161 if (primitive->connectionInfo.assocScanInfoElementsLength)
2162 { 2162 {
2163 primitive->connectionInfo.assocScanInfoElements = (u8 *)CsrPmemAlloc(primitive->connectionInfo.assocScanInfoElementsLength); 2163 primitive->connectionInfo.assocScanInfoElements = kmalloc(primitive->connectionInfo.assocScanInfoElementsLength, GFP_KERNEL);
2164 CsrMemCpyDes(primitive->connectionInfo.assocScanInfoElements, buffer, &offset, ((u16) (primitive->connectionInfo.assocScanInfoElementsLength))); 2164 CsrMemCpyDes(primitive->connectionInfo.assocScanInfoElements, buffer, &offset, ((u16) (primitive->connectionInfo.assocScanInfoElementsLength)));
2165 } 2165 }
2166 else 2166 else
@@ -2173,7 +2173,7 @@ void* CsrWifiSmeAssociationCompleteIndDes(u8 *buffer, size_t length)
2173 CsrUint16Des((u16 *) &primitive->connectionInfo.assocReqInfoElementsLength, buffer, &offset); 2173 CsrUint16Des((u16 *) &primitive->connectionInfo.assocReqInfoElementsLength, buffer, &offset);
2174 if (primitive->connectionInfo.assocReqInfoElementsLength) 2174 if (primitive->connectionInfo.assocReqInfoElementsLength)
2175 { 2175 {
2176 primitive->connectionInfo.assocReqInfoElements = (u8 *)CsrPmemAlloc(primitive->connectionInfo.assocReqInfoElementsLength); 2176 primitive->connectionInfo.assocReqInfoElements = kmalloc(primitive->connectionInfo.assocReqInfoElementsLength, GFP_KERNEL);
2177 CsrMemCpyDes(primitive->connectionInfo.assocReqInfoElements, buffer, &offset, ((u16) (primitive->connectionInfo.assocReqInfoElementsLength))); 2177 CsrMemCpyDes(primitive->connectionInfo.assocReqInfoElements, buffer, &offset, ((u16) (primitive->connectionInfo.assocReqInfoElementsLength)));
2178 } 2178 }
2179 else 2179 else
@@ -2186,7 +2186,7 @@ void* CsrWifiSmeAssociationCompleteIndDes(u8 *buffer, size_t length)
2186 CsrUint16Des((u16 *) &primitive->connectionInfo.assocRspInfoElementsLength, buffer, &offset); 2186 CsrUint16Des((u16 *) &primitive->connectionInfo.assocRspInfoElementsLength, buffer, &offset);
2187 if (primitive->connectionInfo.assocRspInfoElementsLength) 2187 if (primitive->connectionInfo.assocRspInfoElementsLength)
2188 { 2188 {
2189 primitive->connectionInfo.assocRspInfoElements = (u8 *)CsrPmemAlloc(primitive->connectionInfo.assocRspInfoElementsLength); 2189 primitive->connectionInfo.assocRspInfoElements = kmalloc(primitive->connectionInfo.assocRspInfoElementsLength, GFP_KERNEL);
2190 CsrMemCpyDes(primitive->connectionInfo.assocRspInfoElements, buffer, &offset, ((u16) (primitive->connectionInfo.assocRspInfoElementsLength))); 2190 CsrMemCpyDes(primitive->connectionInfo.assocRspInfoElements, buffer, &offset, ((u16) (primitive->connectionInfo.assocRspInfoElementsLength)));
2191 } 2191 }
2192 else 2192 else
@@ -2240,7 +2240,7 @@ u8* CsrWifiSmeAssociationStartIndSer(u8 *ptr, size_t *len, void *msg)
2240 2240
2241void* CsrWifiSmeAssociationStartIndDes(u8 *buffer, size_t length) 2241void* CsrWifiSmeAssociationStartIndDes(u8 *buffer, size_t length)
2242{ 2242{
2243 CsrWifiSmeAssociationStartInd *primitive = (CsrWifiSmeAssociationStartInd *) CsrPmemAlloc(sizeof(CsrWifiSmeAssociationStartInd)); 2243 CsrWifiSmeAssociationStartInd *primitive = kmalloc(sizeof(CsrWifiSmeAssociationStartInd), GFP_KERNEL);
2244 size_t offset; 2244 size_t offset;
2245 offset = 0; 2245 offset = 0;
2246 2246
@@ -2297,7 +2297,7 @@ u8* CsrWifiSmeBlacklistCfmSer(u8 *ptr, size_t *len, void *msg)
2297 2297
2298void* CsrWifiSmeBlacklistCfmDes(u8 *buffer, size_t length) 2298void* CsrWifiSmeBlacklistCfmDes(u8 *buffer, size_t length)
2299{ 2299{
2300 CsrWifiSmeBlacklistCfm *primitive = (CsrWifiSmeBlacklistCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeBlacklistCfm)); 2300 CsrWifiSmeBlacklistCfm *primitive = kmalloc(sizeof(CsrWifiSmeBlacklistCfm), GFP_KERNEL);
2301 size_t offset; 2301 size_t offset;
2302 offset = 0; 2302 offset = 0;
2303 2303
@@ -2309,7 +2309,7 @@ void* CsrWifiSmeBlacklistCfmDes(u8 *buffer, size_t length)
2309 primitive->getAddresses = NULL; 2309 primitive->getAddresses = NULL;
2310 if (primitive->getAddressCount) 2310 if (primitive->getAddressCount)
2311 { 2311 {
2312 primitive->getAddresses = (CsrWifiMacAddress *)CsrPmemAlloc(sizeof(CsrWifiMacAddress) * primitive->getAddressCount); 2312 primitive->getAddresses = kmalloc(sizeof(CsrWifiMacAddress) * primitive->getAddressCount, GFP_KERNEL);
2313 } 2313 }
2314 { 2314 {
2315 u16 i1; 2315 u16 i1;
@@ -2361,7 +2361,7 @@ u8* CsrWifiSmeCalibrationDataGetCfmSer(u8 *ptr, size_t *len, void *msg)
2361 2361
2362void* CsrWifiSmeCalibrationDataGetCfmDes(u8 *buffer, size_t length) 2362void* CsrWifiSmeCalibrationDataGetCfmDes(u8 *buffer, size_t length)
2363{ 2363{
2364 CsrWifiSmeCalibrationDataGetCfm *primitive = (CsrWifiSmeCalibrationDataGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeCalibrationDataGetCfm)); 2364 CsrWifiSmeCalibrationDataGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeCalibrationDataGetCfm), GFP_KERNEL);
2365 size_t offset; 2365 size_t offset;
2366 offset = 0; 2366 offset = 0;
2367 2367
@@ -2370,7 +2370,7 @@ void* CsrWifiSmeCalibrationDataGetCfmDes(u8 *buffer, size_t length)
2370 CsrUint16Des((u16 *) &primitive->calibrationDataLength, buffer, &offset); 2370 CsrUint16Des((u16 *) &primitive->calibrationDataLength, buffer, &offset);
2371 if (primitive->calibrationDataLength) 2371 if (primitive->calibrationDataLength)
2372 { 2372 {
2373 primitive->calibrationData = (u8 *)CsrPmemAlloc(primitive->calibrationDataLength); 2373 primitive->calibrationData = kmalloc(primitive->calibrationDataLength, GFP_KERNEL);
2374 CsrMemCpyDes(primitive->calibrationData, buffer, &offset, ((u16) (primitive->calibrationDataLength))); 2374 CsrMemCpyDes(primitive->calibrationData, buffer, &offset, ((u16) (primitive->calibrationDataLength)));
2375 } 2375 }
2376 else 2376 else
@@ -2422,7 +2422,7 @@ u8* CsrWifiSmeCcxConfigGetCfmSer(u8 *ptr, size_t *len, void *msg)
2422 2422
2423void* CsrWifiSmeCcxConfigGetCfmDes(u8 *buffer, size_t length) 2423void* CsrWifiSmeCcxConfigGetCfmDes(u8 *buffer, size_t length)
2424{ 2424{
2425 CsrWifiSmeCcxConfigGetCfm *primitive = (CsrWifiSmeCcxConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeCcxConfigGetCfm)); 2425 CsrWifiSmeCcxConfigGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeCcxConfigGetCfm), GFP_KERNEL);
2426 size_t offset; 2426 size_t offset;
2427 offset = 0; 2427 offset = 0;
2428 2428
@@ -2462,7 +2462,7 @@ u8* CsrWifiSmeCcxConfigSetCfmSer(u8 *ptr, size_t *len, void *msg)
2462 2462
2463void* CsrWifiSmeCcxConfigSetCfmDes(u8 *buffer, size_t length) 2463void* CsrWifiSmeCcxConfigSetCfmDes(u8 *buffer, size_t length)
2464{ 2464{
2465 CsrWifiSmeCcxConfigSetCfm *primitive = (CsrWifiSmeCcxConfigSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeCcxConfigSetCfm)); 2465 CsrWifiSmeCcxConfigSetCfm *primitive = kmalloc(sizeof(CsrWifiSmeCcxConfigSetCfm), GFP_KERNEL);
2466 size_t offset; 2466 size_t offset;
2467 offset = 0; 2467 offset = 0;
2468 2468
@@ -2524,7 +2524,7 @@ u8* CsrWifiSmeCoexConfigGetCfmSer(u8 *ptr, size_t *len, void *msg)
2524 2524
2525void* CsrWifiSmeCoexConfigGetCfmDes(u8 *buffer, size_t length) 2525void* CsrWifiSmeCoexConfigGetCfmDes(u8 *buffer, size_t length)
2526{ 2526{
2527 CsrWifiSmeCoexConfigGetCfm *primitive = (CsrWifiSmeCoexConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeCoexConfigGetCfm)); 2527 CsrWifiSmeCoexConfigGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeCoexConfigGetCfm), GFP_KERNEL);
2528 size_t offset; 2528 size_t offset;
2529 offset = 0; 2529 offset = 0;
2530 2530
@@ -2591,7 +2591,7 @@ u8* CsrWifiSmeCoexInfoGetCfmSer(u8 *ptr, size_t *len, void *msg)
2591 2591
2592void* CsrWifiSmeCoexInfoGetCfmDes(u8 *buffer, size_t length) 2592void* CsrWifiSmeCoexInfoGetCfmDes(u8 *buffer, size_t length)
2593{ 2593{
2594 CsrWifiSmeCoexInfoGetCfm *primitive = (CsrWifiSmeCoexInfoGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeCoexInfoGetCfm)); 2594 CsrWifiSmeCoexInfoGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeCoexInfoGetCfm), GFP_KERNEL);
2595 size_t offset; 2595 size_t offset;
2596 offset = 0; 2596 offset = 0;
2597 2597
@@ -2636,7 +2636,7 @@ u8* CsrWifiSmeConnectCfmSer(u8 *ptr, size_t *len, void *msg)
2636 2636
2637void* CsrWifiSmeConnectCfmDes(u8 *buffer, size_t length) 2637void* CsrWifiSmeConnectCfmDes(u8 *buffer, size_t length)
2638{ 2638{
2639 CsrWifiSmeConnectCfm *primitive = (CsrWifiSmeConnectCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeConnectCfm)); 2639 CsrWifiSmeConnectCfm *primitive = kmalloc(sizeof(CsrWifiSmeConnectCfm), GFP_KERNEL);
2640 size_t offset; 2640 size_t offset;
2641 offset = 0; 2641 offset = 0;
2642 2642
@@ -2702,7 +2702,7 @@ u8* CsrWifiSmeConnectionConfigGetCfmSer(u8 *ptr, size_t *len, void *msg)
2702 2702
2703void* CsrWifiSmeConnectionConfigGetCfmDes(u8 *buffer, size_t length) 2703void* CsrWifiSmeConnectionConfigGetCfmDes(u8 *buffer, size_t length)
2704{ 2704{
2705 CsrWifiSmeConnectionConfigGetCfm *primitive = (CsrWifiSmeConnectionConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeConnectionConfigGetCfm)); 2705 CsrWifiSmeConnectionConfigGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeConnectionConfigGetCfm), GFP_KERNEL);
2706 size_t offset; 2706 size_t offset;
2707 offset = 0; 2707 offset = 0;
2708 2708
@@ -2720,7 +2720,7 @@ void* CsrWifiSmeConnectionConfigGetCfmDes(u8 *buffer, size_t length)
2720 CsrUint16Des((u16 *) &primitive->connectionConfig.mlmeAssociateReqInformationElementsLength, buffer, &offset); 2720 CsrUint16Des((u16 *) &primitive->connectionConfig.mlmeAssociateReqInformationElementsLength, buffer, &offset);
2721 if (primitive->connectionConfig.mlmeAssociateReqInformationElementsLength) 2721 if (primitive->connectionConfig.mlmeAssociateReqInformationElementsLength)
2722 { 2722 {
2723 primitive->connectionConfig.mlmeAssociateReqInformationElements = (u8 *)CsrPmemAlloc(primitive->connectionConfig.mlmeAssociateReqInformationElementsLength); 2723 primitive->connectionConfig.mlmeAssociateReqInformationElements = kmalloc(primitive->connectionConfig.mlmeAssociateReqInformationElementsLength, GFP_KERNEL);
2724 CsrMemCpyDes(primitive->connectionConfig.mlmeAssociateReqInformationElements, buffer, &offset, ((u16) (primitive->connectionConfig.mlmeAssociateReqInformationElementsLength))); 2724 CsrMemCpyDes(primitive->connectionConfig.mlmeAssociateReqInformationElements, buffer, &offset, ((u16) (primitive->connectionConfig.mlmeAssociateReqInformationElementsLength)));
2725 } 2725 }
2726 else 2726 else
@@ -2848,7 +2848,7 @@ u8* CsrWifiSmeConnectionInfoGetCfmSer(u8 *ptr, size_t *len, void *msg)
2848 2848
2849void* CsrWifiSmeConnectionInfoGetCfmDes(u8 *buffer, size_t length) 2849void* CsrWifiSmeConnectionInfoGetCfmDes(u8 *buffer, size_t length)
2850{ 2850{
2851 CsrWifiSmeConnectionInfoGetCfm *primitive = (CsrWifiSmeConnectionInfoGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeConnectionInfoGetCfm)); 2851 CsrWifiSmeConnectionInfoGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeConnectionInfoGetCfm), GFP_KERNEL);
2852 size_t offset; 2852 size_t offset;
2853 offset = 0; 2853 offset = 0;
2854 2854
@@ -2871,7 +2871,7 @@ void* CsrWifiSmeConnectionInfoGetCfmDes(u8 *buffer, size_t length)
2871 CsrUint16Des((u16 *) &primitive->connectionInfo.beaconFrameLength, buffer, &offset); 2871 CsrUint16Des((u16 *) &primitive->connectionInfo.beaconFrameLength, buffer, &offset);
2872 if (primitive->connectionInfo.beaconFrameLength) 2872 if (primitive->connectionInfo.beaconFrameLength)
2873 { 2873 {
2874 primitive->connectionInfo.beaconFrame = (u8 *)CsrPmemAlloc(primitive->connectionInfo.beaconFrameLength); 2874 primitive->connectionInfo.beaconFrame = kmalloc(primitive->connectionInfo.beaconFrameLength, GFP_KERNEL);
2875 CsrMemCpyDes(primitive->connectionInfo.beaconFrame, buffer, &offset, ((u16) (primitive->connectionInfo.beaconFrameLength))); 2875 CsrMemCpyDes(primitive->connectionInfo.beaconFrame, buffer, &offset, ((u16) (primitive->connectionInfo.beaconFrameLength)));
2876 } 2876 }
2877 else 2877 else
@@ -2881,7 +2881,7 @@ void* CsrWifiSmeConnectionInfoGetCfmDes(u8 *buffer, size_t length)
2881 CsrUint16Des((u16 *) &primitive->connectionInfo.associationReqFrameLength, buffer, &offset); 2881 CsrUint16Des((u16 *) &primitive->connectionInfo.associationReqFrameLength, buffer, &offset);
2882 if (primitive->connectionInfo.associationReqFrameLength) 2882 if (primitive->connectionInfo.associationReqFrameLength)
2883 { 2883 {
2884 primitive->connectionInfo.associationReqFrame = (u8 *)CsrPmemAlloc(primitive->connectionInfo.associationReqFrameLength); 2884 primitive->connectionInfo.associationReqFrame = kmalloc(primitive->connectionInfo.associationReqFrameLength, GFP_KERNEL);
2885 CsrMemCpyDes(primitive->connectionInfo.associationReqFrame, buffer, &offset, ((u16) (primitive->connectionInfo.associationReqFrameLength))); 2885 CsrMemCpyDes(primitive->connectionInfo.associationReqFrame, buffer, &offset, ((u16) (primitive->connectionInfo.associationReqFrameLength)));
2886 } 2886 }
2887 else 2887 else
@@ -2891,7 +2891,7 @@ void* CsrWifiSmeConnectionInfoGetCfmDes(u8 *buffer, size_t length)
2891 CsrUint16Des((u16 *) &primitive->connectionInfo.associationRspFrameLength, buffer, &offset); 2891 CsrUint16Des((u16 *) &primitive->connectionInfo.associationRspFrameLength, buffer, &offset);
2892 if (primitive->connectionInfo.associationRspFrameLength) 2892 if (primitive->connectionInfo.associationRspFrameLength)
2893 { 2893 {
2894 primitive->connectionInfo.associationRspFrame = (u8 *)CsrPmemAlloc(primitive->connectionInfo.associationRspFrameLength); 2894 primitive->connectionInfo.associationRspFrame = kmalloc(primitive->connectionInfo.associationRspFrameLength, GFP_KERNEL);
2895 CsrMemCpyDes(primitive->connectionInfo.associationRspFrame, buffer, &offset, ((u16) (primitive->connectionInfo.associationRspFrameLength))); 2895 CsrMemCpyDes(primitive->connectionInfo.associationRspFrame, buffer, &offset, ((u16) (primitive->connectionInfo.associationRspFrameLength)));
2896 } 2896 }
2897 else 2897 else
@@ -2901,7 +2901,7 @@ void* CsrWifiSmeConnectionInfoGetCfmDes(u8 *buffer, size_t length)
2901 CsrUint16Des((u16 *) &primitive->connectionInfo.assocScanInfoElementsLength, buffer, &offset); 2901 CsrUint16Des((u16 *) &primitive->connectionInfo.assocScanInfoElementsLength, buffer, &offset);
2902 if (primitive->connectionInfo.assocScanInfoElementsLength) 2902 if (primitive->connectionInfo.assocScanInfoElementsLength)
2903 { 2903 {
2904 primitive->connectionInfo.assocScanInfoElements = (u8 *)CsrPmemAlloc(primitive->connectionInfo.assocScanInfoElementsLength); 2904 primitive->connectionInfo.assocScanInfoElements = kmalloc(primitive->connectionInfo.assocScanInfoElementsLength, GFP_KERNEL);
2905 CsrMemCpyDes(primitive->connectionInfo.assocScanInfoElements, buffer, &offset, ((u16) (primitive->connectionInfo.assocScanInfoElementsLength))); 2905 CsrMemCpyDes(primitive->connectionInfo.assocScanInfoElements, buffer, &offset, ((u16) (primitive->connectionInfo.assocScanInfoElementsLength)));
2906 } 2906 }
2907 else 2907 else
@@ -2914,7 +2914,7 @@ void* CsrWifiSmeConnectionInfoGetCfmDes(u8 *buffer, size_t length)
2914 CsrUint16Des((u16 *) &primitive->connectionInfo.assocReqInfoElementsLength, buffer, &offset); 2914 CsrUint16Des((u16 *) &primitive->connectionInfo.assocReqInfoElementsLength, buffer, &offset);
2915 if (primitive->connectionInfo.assocReqInfoElementsLength) 2915 if (primitive->connectionInfo.assocReqInfoElementsLength)
2916 { 2916 {
2917 primitive->connectionInfo.assocReqInfoElements = (u8 *)CsrPmemAlloc(primitive->connectionInfo.assocReqInfoElementsLength); 2917 primitive->connectionInfo.assocReqInfoElements = kmalloc(primitive->connectionInfo.assocReqInfoElementsLength, GFP_KERNEL);
2918 CsrMemCpyDes(primitive->connectionInfo.assocReqInfoElements, buffer, &offset, ((u16) (primitive->connectionInfo.assocReqInfoElementsLength))); 2918 CsrMemCpyDes(primitive->connectionInfo.assocReqInfoElements, buffer, &offset, ((u16) (primitive->connectionInfo.assocReqInfoElementsLength)));
2919 } 2919 }
2920 else 2920 else
@@ -2927,7 +2927,7 @@ void* CsrWifiSmeConnectionInfoGetCfmDes(u8 *buffer, size_t length)
2927 CsrUint16Des((u16 *) &primitive->connectionInfo.assocRspInfoElementsLength, buffer, &offset); 2927 CsrUint16Des((u16 *) &primitive->connectionInfo.assocRspInfoElementsLength, buffer, &offset);
2928 if (primitive->connectionInfo.assocRspInfoElementsLength) 2928 if (primitive->connectionInfo.assocRspInfoElementsLength)
2929 { 2929 {
2930 primitive->connectionInfo.assocRspInfoElements = (u8 *)CsrPmemAlloc(primitive->connectionInfo.assocRspInfoElementsLength); 2930 primitive->connectionInfo.assocRspInfoElements = kmalloc(primitive->connectionInfo.assocRspInfoElementsLength, GFP_KERNEL);
2931 CsrMemCpyDes(primitive->connectionInfo.assocRspInfoElements, buffer, &offset, ((u16) (primitive->connectionInfo.assocRspInfoElementsLength))); 2931 CsrMemCpyDes(primitive->connectionInfo.assocRspInfoElements, buffer, &offset, ((u16) (primitive->connectionInfo.assocRspInfoElementsLength)));
2932 } 2932 }
2933 else 2933 else
@@ -2978,7 +2978,7 @@ u8* CsrWifiSmeConnectionQualityIndSer(u8 *ptr, size_t *len, void *msg)
2978 2978
2979void* CsrWifiSmeConnectionQualityIndDes(u8 *buffer, size_t length) 2979void* CsrWifiSmeConnectionQualityIndDes(u8 *buffer, size_t length)
2980{ 2980{
2981 CsrWifiSmeConnectionQualityInd *primitive = (CsrWifiSmeConnectionQualityInd *) CsrPmemAlloc(sizeof(CsrWifiSmeConnectionQualityInd)); 2981 CsrWifiSmeConnectionQualityInd *primitive = kmalloc(sizeof(CsrWifiSmeConnectionQualityInd), GFP_KERNEL);
2982 size_t offset; 2982 size_t offset;
2983 offset = 0; 2983 offset = 0;
2984 2984
@@ -3065,7 +3065,7 @@ u8* CsrWifiSmeConnectionStatsGetCfmSer(u8 *ptr, size_t *len, void *msg)
3065 3065
3066void* CsrWifiSmeConnectionStatsGetCfmDes(u8 *buffer, size_t length) 3066void* CsrWifiSmeConnectionStatsGetCfmDes(u8 *buffer, size_t length)
3067{ 3067{
3068 CsrWifiSmeConnectionStatsGetCfm *primitive = (CsrWifiSmeConnectionStatsGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeConnectionStatsGetCfm)); 3068 CsrWifiSmeConnectionStatsGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeConnectionStatsGetCfm), GFP_KERNEL);
3069 size_t offset; 3069 size_t offset;
3070 offset = 0; 3070 offset = 0;
3071 3071
@@ -3126,7 +3126,7 @@ u8* CsrWifiSmeDisconnectCfmSer(u8 *ptr, size_t *len, void *msg)
3126 3126
3127void* CsrWifiSmeDisconnectCfmDes(u8 *buffer, size_t length) 3127void* CsrWifiSmeDisconnectCfmDes(u8 *buffer, size_t length)
3128{ 3128{
3129 CsrWifiSmeDisconnectCfm *primitive = (CsrWifiSmeDisconnectCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeDisconnectCfm)); 3129 CsrWifiSmeDisconnectCfm *primitive = kmalloc(sizeof(CsrWifiSmeDisconnectCfm), GFP_KERNEL);
3130 size_t offset; 3130 size_t offset;
3131 offset = 0; 3131 offset = 0;
3132 3132
@@ -3166,7 +3166,7 @@ u8* CsrWifiSmeHostConfigGetCfmSer(u8 *ptr, size_t *len, void *msg)
3166 3166
3167void* CsrWifiSmeHostConfigGetCfmDes(u8 *buffer, size_t length) 3167void* CsrWifiSmeHostConfigGetCfmDes(u8 *buffer, size_t length)
3168{ 3168{
3169 CsrWifiSmeHostConfigGetCfm *primitive = (CsrWifiSmeHostConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeHostConfigGetCfm)); 3169 CsrWifiSmeHostConfigGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeHostConfigGetCfm), GFP_KERNEL);
3170 size_t offset; 3170 size_t offset;
3171 offset = 0; 3171 offset = 0;
3172 3172
@@ -3204,7 +3204,7 @@ u8* CsrWifiSmeHostConfigSetCfmSer(u8 *ptr, size_t *len, void *msg)
3204 3204
3205void* CsrWifiSmeHostConfigSetCfmDes(u8 *buffer, size_t length) 3205void* CsrWifiSmeHostConfigSetCfmDes(u8 *buffer, size_t length)
3206{ 3206{
3207 CsrWifiSmeHostConfigSetCfm *primitive = (CsrWifiSmeHostConfigSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeHostConfigSetCfm)); 3207 CsrWifiSmeHostConfigSetCfm *primitive = kmalloc(sizeof(CsrWifiSmeHostConfigSetCfm), GFP_KERNEL);
3208 size_t offset; 3208 size_t offset;
3209 offset = 0; 3209 offset = 0;
3210 3210
@@ -3240,7 +3240,7 @@ u8* CsrWifiSmeIbssStationIndSer(u8 *ptr, size_t *len, void *msg)
3240 3240
3241void* CsrWifiSmeIbssStationIndDes(u8 *buffer, size_t length) 3241void* CsrWifiSmeIbssStationIndDes(u8 *buffer, size_t length)
3242{ 3242{
3243 CsrWifiSmeIbssStationInd *primitive = (CsrWifiSmeIbssStationInd *) CsrPmemAlloc(sizeof(CsrWifiSmeIbssStationInd)); 3243 CsrWifiSmeIbssStationInd *primitive = kmalloc(sizeof(CsrWifiSmeIbssStationInd), GFP_KERNEL);
3244 size_t offset; 3244 size_t offset;
3245 offset = 0; 3245 offset = 0;
3246 3246
@@ -3282,7 +3282,7 @@ u8* CsrWifiSmeKeyCfmSer(u8 *ptr, size_t *len, void *msg)
3282 3282
3283void* CsrWifiSmeKeyCfmDes(u8 *buffer, size_t length) 3283void* CsrWifiSmeKeyCfmDes(u8 *buffer, size_t length)
3284{ 3284{
3285 CsrWifiSmeKeyCfm *primitive = (CsrWifiSmeKeyCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeKeyCfm)); 3285 CsrWifiSmeKeyCfm *primitive = kmalloc(sizeof(CsrWifiSmeKeyCfm), GFP_KERNEL);
3286 size_t offset; 3286 size_t offset;
3287 offset = 0; 3287 offset = 0;
3288 3288
@@ -3325,7 +3325,7 @@ u8* CsrWifiSmeLinkQualityGetCfmSer(u8 *ptr, size_t *len, void *msg)
3325 3325
3326void* CsrWifiSmeLinkQualityGetCfmDes(u8 *buffer, size_t length) 3326void* CsrWifiSmeLinkQualityGetCfmDes(u8 *buffer, size_t length)
3327{ 3327{
3328 CsrWifiSmeLinkQualityGetCfm *primitive = (CsrWifiSmeLinkQualityGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeLinkQualityGetCfm)); 3328 CsrWifiSmeLinkQualityGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeLinkQualityGetCfm), GFP_KERNEL);
3329 size_t offset; 3329 size_t offset;
3330 offset = 0; 3330 offset = 0;
3331 3331
@@ -3448,7 +3448,7 @@ u8* CsrWifiSmeMediaStatusIndSer(u8 *ptr, size_t *len, void *msg)
3448 3448
3449void* CsrWifiSmeMediaStatusIndDes(u8 *buffer, size_t length) 3449void* CsrWifiSmeMediaStatusIndDes(u8 *buffer, size_t length)
3450{ 3450{
3451 CsrWifiSmeMediaStatusInd *primitive = (CsrWifiSmeMediaStatusInd *) CsrPmemAlloc(sizeof(CsrWifiSmeMediaStatusInd)); 3451 CsrWifiSmeMediaStatusInd *primitive = kmalloc(sizeof(CsrWifiSmeMediaStatusInd), GFP_KERNEL);
3452 size_t offset; 3452 size_t offset;
3453 offset = 0; 3453 offset = 0;
3454 3454
@@ -3471,7 +3471,7 @@ void* CsrWifiSmeMediaStatusIndDes(u8 *buffer, size_t length)
3471 CsrUint16Des((u16 *) &primitive->connectionInfo.beaconFrameLength, buffer, &offset); 3471 CsrUint16Des((u16 *) &primitive->connectionInfo.beaconFrameLength, buffer, &offset);
3472 if (primitive->connectionInfo.beaconFrameLength) 3472 if (primitive->connectionInfo.beaconFrameLength)
3473 { 3473 {
3474 primitive->connectionInfo.beaconFrame = (u8 *)CsrPmemAlloc(primitive->connectionInfo.beaconFrameLength); 3474 primitive->connectionInfo.beaconFrame = kmalloc(primitive->connectionInfo.beaconFrameLength, GFP_KERNEL);
3475 CsrMemCpyDes(primitive->connectionInfo.beaconFrame, buffer, &offset, ((u16) (primitive->connectionInfo.beaconFrameLength))); 3475 CsrMemCpyDes(primitive->connectionInfo.beaconFrame, buffer, &offset, ((u16) (primitive->connectionInfo.beaconFrameLength)));
3476 } 3476 }
3477 else 3477 else
@@ -3481,7 +3481,7 @@ void* CsrWifiSmeMediaStatusIndDes(u8 *buffer, size_t length)
3481 CsrUint16Des((u16 *) &primitive->connectionInfo.associationReqFrameLength, buffer, &offset); 3481 CsrUint16Des((u16 *) &primitive->connectionInfo.associationReqFrameLength, buffer, &offset);
3482 if (primitive->connectionInfo.associationReqFrameLength) 3482 if (primitive->connectionInfo.associationReqFrameLength)
3483 { 3483 {
3484 primitive->connectionInfo.associationReqFrame = (u8 *)CsrPmemAlloc(primitive->connectionInfo.associationReqFrameLength); 3484 primitive->connectionInfo.associationReqFrame = kmalloc(primitive->connectionInfo.associationReqFrameLength, GFP_KERNEL);
3485 CsrMemCpyDes(primitive->connectionInfo.associationReqFrame, buffer, &offset, ((u16) (primitive->connectionInfo.associationReqFrameLength))); 3485 CsrMemCpyDes(primitive->connectionInfo.associationReqFrame, buffer, &offset, ((u16) (primitive->connectionInfo.associationReqFrameLength)));
3486 } 3486 }
3487 else 3487 else
@@ -3491,7 +3491,7 @@ void* CsrWifiSmeMediaStatusIndDes(u8 *buffer, size_t length)
3491 CsrUint16Des((u16 *) &primitive->connectionInfo.associationRspFrameLength, buffer, &offset); 3491 CsrUint16Des((u16 *) &primitive->connectionInfo.associationRspFrameLength, buffer, &offset);
3492 if (primitive->connectionInfo.associationRspFrameLength) 3492 if (primitive->connectionInfo.associationRspFrameLength)
3493 { 3493 {
3494 primitive->connectionInfo.associationRspFrame = (u8 *)CsrPmemAlloc(primitive->connectionInfo.associationRspFrameLength); 3494 primitive->connectionInfo.associationRspFrame = kmalloc(primitive->connectionInfo.associationRspFrameLength, GFP_KERNEL);
3495 CsrMemCpyDes(primitive->connectionInfo.associationRspFrame, buffer, &offset, ((u16) (primitive->connectionInfo.associationRspFrameLength))); 3495 CsrMemCpyDes(primitive->connectionInfo.associationRspFrame, buffer, &offset, ((u16) (primitive->connectionInfo.associationRspFrameLength)));
3496 } 3496 }
3497 else 3497 else
@@ -3501,7 +3501,7 @@ void* CsrWifiSmeMediaStatusIndDes(u8 *buffer, size_t length)
3501 CsrUint16Des((u16 *) &primitive->connectionInfo.assocScanInfoElementsLength, buffer, &offset); 3501 CsrUint16Des((u16 *) &primitive->connectionInfo.assocScanInfoElementsLength, buffer, &offset);
3502 if (primitive->connectionInfo.assocScanInfoElementsLength) 3502 if (primitive->connectionInfo.assocScanInfoElementsLength)
3503 { 3503 {
3504 primitive->connectionInfo.assocScanInfoElements = (u8 *)CsrPmemAlloc(primitive->connectionInfo.assocScanInfoElementsLength); 3504 primitive->connectionInfo.assocScanInfoElements = kmalloc(primitive->connectionInfo.assocScanInfoElementsLength, GFP_KERNEL);
3505 CsrMemCpyDes(primitive->connectionInfo.assocScanInfoElements, buffer, &offset, ((u16) (primitive->connectionInfo.assocScanInfoElementsLength))); 3505 CsrMemCpyDes(primitive->connectionInfo.assocScanInfoElements, buffer, &offset, ((u16) (primitive->connectionInfo.assocScanInfoElementsLength)));
3506 } 3506 }
3507 else 3507 else
@@ -3514,7 +3514,7 @@ void* CsrWifiSmeMediaStatusIndDes(u8 *buffer, size_t length)
3514 CsrUint16Des((u16 *) &primitive->connectionInfo.assocReqInfoElementsLength, buffer, &offset); 3514 CsrUint16Des((u16 *) &primitive->connectionInfo.assocReqInfoElementsLength, buffer, &offset);
3515 if (primitive->connectionInfo.assocReqInfoElementsLength) 3515 if (primitive->connectionInfo.assocReqInfoElementsLength)
3516 { 3516 {
3517 primitive->connectionInfo.assocReqInfoElements = (u8 *)CsrPmemAlloc(primitive->connectionInfo.assocReqInfoElementsLength); 3517 primitive->connectionInfo.assocReqInfoElements = kmalloc(primitive->connectionInfo.assocReqInfoElementsLength, GFP_KERNEL);
3518 CsrMemCpyDes(primitive->connectionInfo.assocReqInfoElements, buffer, &offset, ((u16) (primitive->connectionInfo.assocReqInfoElementsLength))); 3518 CsrMemCpyDes(primitive->connectionInfo.assocReqInfoElements, buffer, &offset, ((u16) (primitive->connectionInfo.assocReqInfoElementsLength)));
3519 } 3519 }
3520 else 3520 else
@@ -3527,7 +3527,7 @@ void* CsrWifiSmeMediaStatusIndDes(u8 *buffer, size_t length)
3527 CsrUint16Des((u16 *) &primitive->connectionInfo.assocRspInfoElementsLength, buffer, &offset); 3527 CsrUint16Des((u16 *) &primitive->connectionInfo.assocRspInfoElementsLength, buffer, &offset);
3528 if (primitive->connectionInfo.assocRspInfoElementsLength) 3528 if (primitive->connectionInfo.assocRspInfoElementsLength)
3529 { 3529 {
3530 primitive->connectionInfo.assocRspInfoElements = (u8 *)CsrPmemAlloc(primitive->connectionInfo.assocRspInfoElementsLength); 3530 primitive->connectionInfo.assocRspInfoElements = kmalloc(primitive->connectionInfo.assocRspInfoElementsLength, GFP_KERNEL);
3531 CsrMemCpyDes(primitive->connectionInfo.assocRspInfoElements, buffer, &offset, ((u16) (primitive->connectionInfo.assocRspInfoElementsLength))); 3531 CsrMemCpyDes(primitive->connectionInfo.assocRspInfoElements, buffer, &offset, ((u16) (primitive->connectionInfo.assocRspInfoElementsLength)));
3532 } 3532 }
3533 else 3533 else
@@ -3586,7 +3586,7 @@ u8* CsrWifiSmeMibConfigGetCfmSer(u8 *ptr, size_t *len, void *msg)
3586 3586
3587void* CsrWifiSmeMibConfigGetCfmDes(u8 *buffer, size_t length) 3587void* CsrWifiSmeMibConfigGetCfmDes(u8 *buffer, size_t length)
3588{ 3588{
3589 CsrWifiSmeMibConfigGetCfm *primitive = (CsrWifiSmeMibConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeMibConfigGetCfm)); 3589 CsrWifiSmeMibConfigGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeMibConfigGetCfm), GFP_KERNEL);
3590 size_t offset; 3590 size_t offset;
3591 offset = 0; 3591 offset = 0;
3592 3592
@@ -3632,7 +3632,7 @@ u8* CsrWifiSmeMibGetCfmSer(u8 *ptr, size_t *len, void *msg)
3632 3632
3633void* CsrWifiSmeMibGetCfmDes(u8 *buffer, size_t length) 3633void* CsrWifiSmeMibGetCfmDes(u8 *buffer, size_t length)
3634{ 3634{
3635 CsrWifiSmeMibGetCfm *primitive = (CsrWifiSmeMibGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeMibGetCfm)); 3635 CsrWifiSmeMibGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeMibGetCfm), GFP_KERNEL);
3636 size_t offset; 3636 size_t offset;
3637 offset = 0; 3637 offset = 0;
3638 3638
@@ -3641,7 +3641,7 @@ void* CsrWifiSmeMibGetCfmDes(u8 *buffer, size_t length)
3641 CsrUint16Des((u16 *) &primitive->mibAttributeLength, buffer, &offset); 3641 CsrUint16Des((u16 *) &primitive->mibAttributeLength, buffer, &offset);
3642 if (primitive->mibAttributeLength) 3642 if (primitive->mibAttributeLength)
3643 { 3643 {
3644 primitive->mibAttribute = (u8 *)CsrPmemAlloc(primitive->mibAttributeLength); 3644 primitive->mibAttribute = kmalloc(primitive->mibAttributeLength, GFP_KERNEL);
3645 CsrMemCpyDes(primitive->mibAttribute, buffer, &offset, ((u16) (primitive->mibAttributeLength))); 3645 CsrMemCpyDes(primitive->mibAttribute, buffer, &offset, ((u16) (primitive->mibAttributeLength)));
3646 } 3646 }
3647 else 3647 else
@@ -3691,7 +3691,7 @@ u8* CsrWifiSmeMibGetNextCfmSer(u8 *ptr, size_t *len, void *msg)
3691 3691
3692void* CsrWifiSmeMibGetNextCfmDes(u8 *buffer, size_t length) 3692void* CsrWifiSmeMibGetNextCfmDes(u8 *buffer, size_t length)
3693{ 3693{
3694 CsrWifiSmeMibGetNextCfm *primitive = (CsrWifiSmeMibGetNextCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeMibGetNextCfm)); 3694 CsrWifiSmeMibGetNextCfm *primitive = kmalloc(sizeof(CsrWifiSmeMibGetNextCfm), GFP_KERNEL);
3695 size_t offset; 3695 size_t offset;
3696 offset = 0; 3696 offset = 0;
3697 3697
@@ -3700,7 +3700,7 @@ void* CsrWifiSmeMibGetNextCfmDes(u8 *buffer, size_t length)
3700 CsrUint16Des((u16 *) &primitive->mibAttributeLength, buffer, &offset); 3700 CsrUint16Des((u16 *) &primitive->mibAttributeLength, buffer, &offset);
3701 if (primitive->mibAttributeLength) 3701 if (primitive->mibAttributeLength)
3702 { 3702 {
3703 primitive->mibAttribute = (u8 *)CsrPmemAlloc(primitive->mibAttributeLength); 3703 primitive->mibAttribute = kmalloc(primitive->mibAttributeLength, GFP_KERNEL);
3704 CsrMemCpyDes(primitive->mibAttribute, buffer, &offset, ((u16) (primitive->mibAttributeLength))); 3704 CsrMemCpyDes(primitive->mibAttribute, buffer, &offset, ((u16) (primitive->mibAttributeLength)));
3705 } 3705 }
3706 else 3706 else
@@ -3750,7 +3750,7 @@ u8* CsrWifiSmeMicFailureIndSer(u8 *ptr, size_t *len, void *msg)
3750 3750
3751void* CsrWifiSmeMicFailureIndDes(u8 *buffer, size_t length) 3751void* CsrWifiSmeMicFailureIndDes(u8 *buffer, size_t length)
3752{ 3752{
3753 CsrWifiSmeMicFailureInd *primitive = (CsrWifiSmeMicFailureInd *) CsrPmemAlloc(sizeof(CsrWifiSmeMicFailureInd)); 3753 CsrWifiSmeMicFailureInd *primitive = kmalloc(sizeof(CsrWifiSmeMicFailureInd), GFP_KERNEL);
3754 size_t offset; 3754 size_t offset;
3755 offset = 0; 3755 offset = 0;
3756 3756
@@ -3808,7 +3808,7 @@ u8* CsrWifiSmeMulticastAddressCfmSer(u8 *ptr, size_t *len, void *msg)
3808 3808
3809void* CsrWifiSmeMulticastAddressCfmDes(u8 *buffer, size_t length) 3809void* CsrWifiSmeMulticastAddressCfmDes(u8 *buffer, size_t length)
3810{ 3810{
3811 CsrWifiSmeMulticastAddressCfm *primitive = (CsrWifiSmeMulticastAddressCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeMulticastAddressCfm)); 3811 CsrWifiSmeMulticastAddressCfm *primitive = kmalloc(sizeof(CsrWifiSmeMulticastAddressCfm), GFP_KERNEL);
3812 size_t offset; 3812 size_t offset;
3813 offset = 0; 3813 offset = 0;
3814 3814
@@ -3820,7 +3820,7 @@ void* CsrWifiSmeMulticastAddressCfmDes(u8 *buffer, size_t length)
3820 primitive->getAddresses = NULL; 3820 primitive->getAddresses = NULL;
3821 if (primitive->getAddressesCount) 3821 if (primitive->getAddressesCount)
3822 { 3822 {
3823 primitive->getAddresses = (CsrWifiMacAddress *)CsrPmemAlloc(sizeof(CsrWifiMacAddress) * primitive->getAddressesCount); 3823 primitive->getAddresses = kmalloc(sizeof(CsrWifiMacAddress) * primitive->getAddressesCount, GFP_KERNEL);
3824 } 3824 }
3825 { 3825 {
3826 u16 i1; 3826 u16 i1;
@@ -3866,7 +3866,7 @@ u8* CsrWifiSmePacketFilterSetCfmSer(u8 *ptr, size_t *len, void *msg)
3866 3866
3867void* CsrWifiSmePacketFilterSetCfmDes(u8 *buffer, size_t length) 3867void* CsrWifiSmePacketFilterSetCfmDes(u8 *buffer, size_t length)
3868{ 3868{
3869 CsrWifiSmePacketFilterSetCfm *primitive = (CsrWifiSmePacketFilterSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmePacketFilterSetCfm)); 3869 CsrWifiSmePacketFilterSetCfm *primitive = kmalloc(sizeof(CsrWifiSmePacketFilterSetCfm), GFP_KERNEL);
3870 size_t offset; 3870 size_t offset;
3871 offset = 0; 3871 offset = 0;
3872 3872
@@ -3902,7 +3902,7 @@ u8* CsrWifiSmePermanentMacAddressGetCfmSer(u8 *ptr, size_t *len, void *msg)
3902 3902
3903void* CsrWifiSmePermanentMacAddressGetCfmDes(u8 *buffer, size_t length) 3903void* CsrWifiSmePermanentMacAddressGetCfmDes(u8 *buffer, size_t length)
3904{ 3904{
3905 CsrWifiSmePermanentMacAddressGetCfm *primitive = (CsrWifiSmePermanentMacAddressGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmePermanentMacAddressGetCfm)); 3905 CsrWifiSmePermanentMacAddressGetCfm *primitive = kmalloc(sizeof(CsrWifiSmePermanentMacAddressGetCfm), GFP_KERNEL);
3906 size_t offset; 3906 size_t offset;
3907 offset = 0; 3907 offset = 0;
3908 3908
@@ -3955,7 +3955,7 @@ u8* CsrWifiSmePmkidCandidateListIndSer(u8 *ptr, size_t *len, void *msg)
3955 3955
3956void* CsrWifiSmePmkidCandidateListIndDes(u8 *buffer, size_t length) 3956void* CsrWifiSmePmkidCandidateListIndDes(u8 *buffer, size_t length)
3957{ 3957{
3958 CsrWifiSmePmkidCandidateListInd *primitive = (CsrWifiSmePmkidCandidateListInd *) CsrPmemAlloc(sizeof(CsrWifiSmePmkidCandidateListInd)); 3958 CsrWifiSmePmkidCandidateListInd *primitive = kmalloc(sizeof(CsrWifiSmePmkidCandidateListInd), GFP_KERNEL);
3959 size_t offset; 3959 size_t offset;
3960 offset = 0; 3960 offset = 0;
3961 3961
@@ -3965,7 +3965,7 @@ void* CsrWifiSmePmkidCandidateListIndDes(u8 *buffer, size_t length)
3965 primitive->pmkidCandidates = NULL; 3965 primitive->pmkidCandidates = NULL;
3966 if (primitive->pmkidCandidatesCount) 3966 if (primitive->pmkidCandidatesCount)
3967 { 3967 {
3968 primitive->pmkidCandidates = (CsrWifiSmePmkidCandidate *)CsrPmemAlloc(sizeof(CsrWifiSmePmkidCandidate) * primitive->pmkidCandidatesCount); 3968 primitive->pmkidCandidates = kmalloc(sizeof(CsrWifiSmePmkidCandidate) * primitive->pmkidCandidatesCount, GFP_KERNEL);
3969 } 3969 }
3970 { 3970 {
3971 u16 i1; 3971 u16 i1;
@@ -4033,7 +4033,7 @@ u8* CsrWifiSmePmkidCfmSer(u8 *ptr, size_t *len, void *msg)
4033 4033
4034void* CsrWifiSmePmkidCfmDes(u8 *buffer, size_t length) 4034void* CsrWifiSmePmkidCfmDes(u8 *buffer, size_t length)
4035{ 4035{
4036 CsrWifiSmePmkidCfm *primitive = (CsrWifiSmePmkidCfm *) CsrPmemAlloc(sizeof(CsrWifiSmePmkidCfm)); 4036 CsrWifiSmePmkidCfm *primitive = kmalloc(sizeof(CsrWifiSmePmkidCfm), GFP_KERNEL);
4037 size_t offset; 4037 size_t offset;
4038 offset = 0; 4038 offset = 0;
4039 4039
@@ -4045,7 +4045,7 @@ void* CsrWifiSmePmkidCfmDes(u8 *buffer, size_t length)
4045 primitive->getPmkids = NULL; 4045 primitive->getPmkids = NULL;
4046 if (primitive->getPmkidsCount) 4046 if (primitive->getPmkidsCount)
4047 { 4047 {
4048 primitive->getPmkids = (CsrWifiSmePmkid *)CsrPmemAlloc(sizeof(CsrWifiSmePmkid) * primitive->getPmkidsCount); 4048 primitive->getPmkids = kmalloc(sizeof(CsrWifiSmePmkid) * primitive->getPmkidsCount, GFP_KERNEL);
4049 } 4049 }
4050 { 4050 {
4051 u16 i1; 4051 u16 i1;
@@ -4104,7 +4104,7 @@ u8* CsrWifiSmePowerConfigGetCfmSer(u8 *ptr, size_t *len, void *msg)
4104 4104
4105void* CsrWifiSmePowerConfigGetCfmDes(u8 *buffer, size_t length) 4105void* CsrWifiSmePowerConfigGetCfmDes(u8 *buffer, size_t length)
4106{ 4106{
4107 CsrWifiSmePowerConfigGetCfm *primitive = (CsrWifiSmePowerConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmePowerConfigGetCfm)); 4107 CsrWifiSmePowerConfigGetCfm *primitive = kmalloc(sizeof(CsrWifiSmePowerConfigGetCfm), GFP_KERNEL);
4108 size_t offset; 4108 size_t offset;
4109 offset = 0; 4109 offset = 0;
4110 4110
@@ -4152,7 +4152,7 @@ u8* CsrWifiSmeRegulatoryDomainInfoGetCfmSer(u8 *ptr, size_t *len, void *msg)
4152 4152
4153void* CsrWifiSmeRegulatoryDomainInfoGetCfmDes(u8 *buffer, size_t length) 4153void* CsrWifiSmeRegulatoryDomainInfoGetCfmDes(u8 *buffer, size_t length)
4154{ 4154{
4155 CsrWifiSmeRegulatoryDomainInfoGetCfm *primitive = (CsrWifiSmeRegulatoryDomainInfoGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeRegulatoryDomainInfoGetCfm)); 4155 CsrWifiSmeRegulatoryDomainInfoGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeRegulatoryDomainInfoGetCfm), GFP_KERNEL);
4156 size_t offset; 4156 size_t offset;
4157 offset = 0; 4157 offset = 0;
4158 4158
@@ -4191,7 +4191,7 @@ u8* CsrWifiSmeRoamCompleteIndSer(u8 *ptr, size_t *len, void *msg)
4191 4191
4192void* CsrWifiSmeRoamCompleteIndDes(u8 *buffer, size_t length) 4192void* CsrWifiSmeRoamCompleteIndDes(u8 *buffer, size_t length)
4193{ 4193{
4194 CsrWifiSmeRoamCompleteInd *primitive = (CsrWifiSmeRoamCompleteInd *) CsrPmemAlloc(sizeof(CsrWifiSmeRoamCompleteInd)); 4194 CsrWifiSmeRoamCompleteInd *primitive = kmalloc(sizeof(CsrWifiSmeRoamCompleteInd), GFP_KERNEL);
4195 size_t offset; 4195 size_t offset;
4196 offset = 0; 4196 offset = 0;
4197 4197
@@ -4229,7 +4229,7 @@ u8* CsrWifiSmeRoamStartIndSer(u8 *ptr, size_t *len, void *msg)
4229 4229
4230void* CsrWifiSmeRoamStartIndDes(u8 *buffer, size_t length) 4230void* CsrWifiSmeRoamStartIndDes(u8 *buffer, size_t length)
4231{ 4231{
4232 CsrWifiSmeRoamStartInd *primitive = (CsrWifiSmeRoamStartInd *) CsrPmemAlloc(sizeof(CsrWifiSmeRoamStartInd)); 4232 CsrWifiSmeRoamStartInd *primitive = kmalloc(sizeof(CsrWifiSmeRoamStartInd), GFP_KERNEL);
4233 size_t offset; 4233 size_t offset;
4234 offset = 0; 4234 offset = 0;
4235 4235
@@ -4318,7 +4318,7 @@ u8* CsrWifiSmeRoamingConfigGetCfmSer(u8 *ptr, size_t *len, void *msg)
4318 4318
4319void* CsrWifiSmeRoamingConfigGetCfmDes(u8 *buffer, size_t length) 4319void* CsrWifiSmeRoamingConfigGetCfmDes(u8 *buffer, size_t length)
4320{ 4320{
4321 CsrWifiSmeRoamingConfigGetCfm *primitive = (CsrWifiSmeRoamingConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeRoamingConfigGetCfm)); 4321 CsrWifiSmeRoamingConfigGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeRoamingConfigGetCfm), GFP_KERNEL);
4322 size_t offset; 4322 size_t offset;
4323 offset = 0; 4323 offset = 0;
4324 4324
@@ -4380,7 +4380,7 @@ u8* CsrWifiSmeRoamingConfigSetCfmSer(u8 *ptr, size_t *len, void *msg)
4380 4380
4381void* CsrWifiSmeRoamingConfigSetCfmDes(u8 *buffer, size_t length) 4381void* CsrWifiSmeRoamingConfigSetCfmDes(u8 *buffer, size_t length)
4382{ 4382{
4383 CsrWifiSmeRoamingConfigSetCfm *primitive = (CsrWifiSmeRoamingConfigSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeRoamingConfigSetCfm)); 4383 CsrWifiSmeRoamingConfigSetCfm *primitive = kmalloc(sizeof(CsrWifiSmeRoamingConfigSetCfm), GFP_KERNEL);
4384 size_t offset; 4384 size_t offset;
4385 offset = 0; 4385 offset = 0;
4386 4386
@@ -4462,7 +4462,7 @@ u8* CsrWifiSmeScanConfigGetCfmSer(u8 *ptr, size_t *len, void *msg)
4462 4462
4463void* CsrWifiSmeScanConfigGetCfmDes(u8 *buffer, size_t length) 4463void* CsrWifiSmeScanConfigGetCfmDes(u8 *buffer, size_t length)
4464{ 4464{
4465 CsrWifiSmeScanConfigGetCfm *primitive = (CsrWifiSmeScanConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeScanConfigGetCfm)); 4465 CsrWifiSmeScanConfigGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeScanConfigGetCfm), GFP_KERNEL);
4466 size_t offset; 4466 size_t offset;
4467 offset = 0; 4467 offset = 0;
4468 4468
@@ -4491,7 +4491,7 @@ void* CsrWifiSmeScanConfigGetCfmDes(u8 *buffer, size_t length)
4491 CsrUint16Des((u16 *) &primitive->scanConfig.passiveChannelListCount, buffer, &offset); 4491 CsrUint16Des((u16 *) &primitive->scanConfig.passiveChannelListCount, buffer, &offset);
4492 if (primitive->scanConfig.passiveChannelListCount) 4492 if (primitive->scanConfig.passiveChannelListCount)
4493 { 4493 {
4494 primitive->scanConfig.passiveChannelList = (u8 *)CsrPmemAlloc(primitive->scanConfig.passiveChannelListCount); 4494 primitive->scanConfig.passiveChannelList = kmalloc(primitive->scanConfig.passiveChannelListCount, GFP_KERNEL);
4495 CsrMemCpyDes(primitive->scanConfig.passiveChannelList, buffer, &offset, ((u16) (primitive->scanConfig.passiveChannelListCount))); 4495 CsrMemCpyDes(primitive->scanConfig.passiveChannelList, buffer, &offset, ((u16) (primitive->scanConfig.passiveChannelListCount)));
4496 } 4496 }
4497 else 4497 else
@@ -4675,7 +4675,7 @@ u8* CsrWifiSmeScanResultIndSer(u8 *ptr, size_t *len, void *msg)
4675 4675
4676void* CsrWifiSmeScanResultIndDes(u8 *buffer, size_t length) 4676void* CsrWifiSmeScanResultIndDes(u8 *buffer, size_t length)
4677{ 4677{
4678 CsrWifiSmeScanResultInd *primitive = (CsrWifiSmeScanResultInd *) CsrPmemAlloc(sizeof(CsrWifiSmeScanResultInd)); 4678 CsrWifiSmeScanResultInd *primitive = kmalloc(sizeof(CsrWifiSmeScanResultInd), GFP_KERNEL);
4679 size_t offset; 4679 size_t offset;
4680 offset = 0; 4680 offset = 0;
4681 4681
@@ -4697,7 +4697,7 @@ void* CsrWifiSmeScanResultIndDes(u8 *buffer, size_t length)
4697 CsrUint16Des((u16 *) &primitive->result.informationElementsLength, buffer, &offset); 4697 CsrUint16Des((u16 *) &primitive->result.informationElementsLength, buffer, &offset);
4698 if (primitive->result.informationElementsLength) 4698 if (primitive->result.informationElementsLength)
4699 { 4699 {
4700 primitive->result.informationElements = (u8 *)CsrPmemAlloc(primitive->result.informationElementsLength); 4700 primitive->result.informationElements = kmalloc(primitive->result.informationElementsLength, GFP_KERNEL);
4701 CsrMemCpyDes(primitive->result.informationElements, buffer, &offset, ((u16) (primitive->result.informationElementsLength))); 4701 CsrMemCpyDes(primitive->result.informationElements, buffer, &offset, ((u16) (primitive->result.informationElementsLength)));
4702 } 4702 }
4703 else 4703 else
@@ -4717,7 +4717,7 @@ void* CsrWifiSmeScanResultIndDes(u8 *buffer, size_t length)
4717 primitive->result.deviceInfo.groupInfo.p2PClientInfo = NULL; 4717 primitive->result.deviceInfo.groupInfo.p2PClientInfo = NULL;
4718 if (primitive->result.deviceInfo.groupInfo.p2pClientInfoCount) 4718 if (primitive->result.deviceInfo.groupInfo.p2pClientInfoCount)
4719 { 4719 {
4720 primitive->result.deviceInfo.groupInfo.p2PClientInfo = (CsrWifiSmeP2pClientInfoType *)CsrPmemAlloc(sizeof(CsrWifiSmeP2pClientInfoType) * primitive->result.deviceInfo.groupInfo.p2pClientInfoCount); 4720 primitive->result.deviceInfo.groupInfo.p2PClientInfo = kmalloc(sizeof(CsrWifiSmeP2pClientInfoType) * primitive->result.deviceInfo.groupInfo.p2pClientInfoCount, GFP_KERNEL);
4721 } 4721 }
4722 { 4722 {
4723 u16 i4; 4723 u16 i4;
@@ -4732,7 +4732,7 @@ void* CsrWifiSmeScanResultIndDes(u8 *buffer, size_t length)
4732 primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType = NULL; 4732 primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType = NULL;
4733 if (primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secondaryDeviceTypeCount) 4733 if (primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secondaryDeviceTypeCount)
4734 { 4734 {
4735 primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType = (CsrWifiSmeWpsDeviceType *)CsrPmemAlloc(sizeof(CsrWifiSmeWpsDeviceType) * primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secondaryDeviceTypeCount); 4735 primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType = kmalloc(sizeof(CsrWifiSmeWpsDeviceType) * primitive->result.deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secondaryDeviceTypeCount, GFP_KERNEL);
4736 } 4736 }
4737 { 4737 {
4738 u16 i6; 4738 u16 i6;
@@ -4758,7 +4758,7 @@ void* CsrWifiSmeScanResultIndDes(u8 *buffer, size_t length)
4758 primitive->result.deviceInfo.standalonedevInfo.secDeviceType = NULL; 4758 primitive->result.deviceInfo.standalonedevInfo.secDeviceType = NULL;
4759 if (primitive->result.deviceInfo.standalonedevInfo.secondaryDeviceTypeCount) 4759 if (primitive->result.deviceInfo.standalonedevInfo.secondaryDeviceTypeCount)
4760 { 4760 {
4761 primitive->result.deviceInfo.standalonedevInfo.secDeviceType = (CsrWifiSmeWpsDeviceType *)CsrPmemAlloc(sizeof(CsrWifiSmeWpsDeviceType) * primitive->result.deviceInfo.standalonedevInfo.secondaryDeviceTypeCount); 4761 primitive->result.deviceInfo.standalonedevInfo.secDeviceType = kmalloc(sizeof(CsrWifiSmeWpsDeviceType) * primitive->result.deviceInfo.standalonedevInfo.secondaryDeviceTypeCount, GFP_KERNEL);
4762 } 4762 }
4763 { 4763 {
4764 u16 i4; 4764 u16 i4;
@@ -4984,7 +4984,7 @@ u8* CsrWifiSmeScanResultsGetCfmSer(u8 *ptr, size_t *len, void *msg)
4984 4984
4985void* CsrWifiSmeScanResultsGetCfmDes(u8 *buffer, size_t length) 4985void* CsrWifiSmeScanResultsGetCfmDes(u8 *buffer, size_t length)
4986{ 4986{
4987 CsrWifiSmeScanResultsGetCfm *primitive = (CsrWifiSmeScanResultsGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeScanResultsGetCfm)); 4987 CsrWifiSmeScanResultsGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeScanResultsGetCfm), GFP_KERNEL);
4988 size_t offset; 4988 size_t offset;
4989 offset = 0; 4989 offset = 0;
4990 4990
@@ -4994,7 +4994,7 @@ void* CsrWifiSmeScanResultsGetCfmDes(u8 *buffer, size_t length)
4994 primitive->scanResults = NULL; 4994 primitive->scanResults = NULL;
4995 if (primitive->scanResultsCount) 4995 if (primitive->scanResultsCount)
4996 { 4996 {
4997 primitive->scanResults = (CsrWifiSmeScanResult *)CsrPmemAlloc(sizeof(CsrWifiSmeScanResult) * primitive->scanResultsCount); 4997 primitive->scanResults = kmalloc(sizeof(CsrWifiSmeScanResult) * primitive->scanResultsCount, GFP_KERNEL);
4998 } 4998 }
4999 { 4999 {
5000 u16 i1; 5000 u16 i1;
@@ -5017,7 +5017,7 @@ void* CsrWifiSmeScanResultsGetCfmDes(u8 *buffer, size_t length)
5017 CsrUint16Des((u16 *) &primitive->scanResults[i1].informationElementsLength, buffer, &offset); 5017 CsrUint16Des((u16 *) &primitive->scanResults[i1].informationElementsLength, buffer, &offset);
5018 if (primitive->scanResults[i1].informationElementsLength) 5018 if (primitive->scanResults[i1].informationElementsLength)
5019 { 5019 {
5020 primitive->scanResults[i1].informationElements = (u8 *)CsrPmemAlloc(primitive->scanResults[i1].informationElementsLength); 5020 primitive->scanResults[i1].informationElements = kmalloc(primitive->scanResults[i1].informationElementsLength, GFP_KERNEL);
5021 CsrMemCpyDes(primitive->scanResults[i1].informationElements, buffer, &offset, ((u16) (primitive->scanResults[i1].informationElementsLength))); 5021 CsrMemCpyDes(primitive->scanResults[i1].informationElements, buffer, &offset, ((u16) (primitive->scanResults[i1].informationElementsLength)));
5022 } 5022 }
5023 else 5023 else
@@ -5037,7 +5037,7 @@ void* CsrWifiSmeScanResultsGetCfmDes(u8 *buffer, size_t length)
5037 primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo = NULL; 5037 primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo = NULL;
5038 if (primitive->scanResults[i1].deviceInfo.groupInfo.p2pClientInfoCount) 5038 if (primitive->scanResults[i1].deviceInfo.groupInfo.p2pClientInfoCount)
5039 { 5039 {
5040 primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo = (CsrWifiSmeP2pClientInfoType *)CsrPmemAlloc(sizeof(CsrWifiSmeP2pClientInfoType) * primitive->scanResults[i1].deviceInfo.groupInfo.p2pClientInfoCount); 5040 primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo = kmalloc(sizeof(CsrWifiSmeP2pClientInfoType) * primitive->scanResults[i1].deviceInfo.groupInfo.p2pClientInfoCount, GFP_KERNEL);
5041 } 5041 }
5042 { 5042 {
5043 u16 i4; 5043 u16 i4;
@@ -5052,7 +5052,7 @@ void* CsrWifiSmeScanResultsGetCfmDes(u8 *buffer, size_t length)
5052 primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType = NULL; 5052 primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType = NULL;
5053 if (primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secondaryDeviceTypeCount) 5053 if (primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secondaryDeviceTypeCount)
5054 { 5054 {
5055 primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType = (CsrWifiSmeWpsDeviceType *)CsrPmemAlloc(sizeof(CsrWifiSmeWpsDeviceType) * primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secondaryDeviceTypeCount); 5055 primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secDeviceType = kmalloc(sizeof(CsrWifiSmeWpsDeviceType) * primitive->scanResults[i1].deviceInfo.groupInfo.p2PClientInfo[i4].clientDeviceInfo.secondaryDeviceTypeCount, GFP_KERNEL);
5056 } 5056 }
5057 { 5057 {
5058 u16 i6; 5058 u16 i6;
@@ -5078,7 +5078,7 @@ void* CsrWifiSmeScanResultsGetCfmDes(u8 *buffer, size_t length)
5078 primitive->scanResults[i1].deviceInfo.standalonedevInfo.secDeviceType = NULL; 5078 primitive->scanResults[i1].deviceInfo.standalonedevInfo.secDeviceType = NULL;
5079 if (primitive->scanResults[i1].deviceInfo.standalonedevInfo.secondaryDeviceTypeCount) 5079 if (primitive->scanResults[i1].deviceInfo.standalonedevInfo.secondaryDeviceTypeCount)
5080 { 5080 {
5081 primitive->scanResults[i1].deviceInfo.standalonedevInfo.secDeviceType = (CsrWifiSmeWpsDeviceType *)CsrPmemAlloc(sizeof(CsrWifiSmeWpsDeviceType) * primitive->scanResults[i1].deviceInfo.standalonedevInfo.secondaryDeviceTypeCount); 5081 primitive->scanResults[i1].deviceInfo.standalonedevInfo.secDeviceType = kmalloc(sizeof(CsrWifiSmeWpsDeviceType) * primitive->scanResults[i1].deviceInfo.standalonedevInfo.secondaryDeviceTypeCount, GFP_KERNEL);
5082 } 5082 }
5083 { 5083 {
5084 u16 i4; 5084 u16 i4;
@@ -5169,7 +5169,7 @@ u8* CsrWifiSmeSmeStaConfigGetCfmSer(u8 *ptr, size_t *len, void *msg)
5169 5169
5170void* CsrWifiSmeSmeStaConfigGetCfmDes(u8 *buffer, size_t length) 5170void* CsrWifiSmeSmeStaConfigGetCfmDes(u8 *buffer, size_t length)
5171{ 5171{
5172 CsrWifiSmeSmeStaConfigGetCfm *primitive = (CsrWifiSmeSmeStaConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeSmeStaConfigGetCfm)); 5172 CsrWifiSmeSmeStaConfigGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeSmeStaConfigGetCfm), GFP_KERNEL);
5173 size_t offset; 5173 size_t offset;
5174 offset = 0; 5174 offset = 0;
5175 5175
@@ -5211,7 +5211,7 @@ u8* CsrWifiSmeSmeStaConfigSetCfmSer(u8 *ptr, size_t *len, void *msg)
5211 5211
5212void* CsrWifiSmeSmeStaConfigSetCfmDes(u8 *buffer, size_t length) 5212void* CsrWifiSmeSmeStaConfigSetCfmDes(u8 *buffer, size_t length)
5213{ 5213{
5214 CsrWifiSmeSmeStaConfigSetCfm *primitive = (CsrWifiSmeSmeStaConfigSetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeSmeStaConfigSetCfm)); 5214 CsrWifiSmeSmeStaConfigSetCfm *primitive = kmalloc(sizeof(CsrWifiSmeSmeStaConfigSetCfm), GFP_KERNEL);
5215 size_t offset; 5215 size_t offset;
5216 offset = 0; 5216 offset = 0;
5217 5217
@@ -5259,7 +5259,7 @@ u8* CsrWifiSmeStationMacAddressGetCfmSer(u8 *ptr, size_t *len, void *msg)
5259 5259
5260void* CsrWifiSmeStationMacAddressGetCfmDes(u8 *buffer, size_t length) 5260void* CsrWifiSmeStationMacAddressGetCfmDes(u8 *buffer, size_t length)
5261{ 5261{
5262 CsrWifiSmeStationMacAddressGetCfm *primitive = (CsrWifiSmeStationMacAddressGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeStationMacAddressGetCfm)); 5262 CsrWifiSmeStationMacAddressGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeStationMacAddressGetCfm), GFP_KERNEL);
5263 size_t offset; 5263 size_t offset;
5264 offset = 0; 5264 offset = 0;
5265 5265
@@ -5311,7 +5311,7 @@ u8* CsrWifiSmeTspecIndSer(u8 *ptr, size_t *len, void *msg)
5311 5311
5312void* CsrWifiSmeTspecIndDes(u8 *buffer, size_t length) 5312void* CsrWifiSmeTspecIndDes(u8 *buffer, size_t length)
5313{ 5313{
5314 CsrWifiSmeTspecInd *primitive = (CsrWifiSmeTspecInd *) CsrPmemAlloc(sizeof(CsrWifiSmeTspecInd)); 5314 CsrWifiSmeTspecInd *primitive = kmalloc(sizeof(CsrWifiSmeTspecInd), GFP_KERNEL);
5315 size_t offset; 5315 size_t offset;
5316 offset = 0; 5316 offset = 0;
5317 5317
@@ -5322,7 +5322,7 @@ void* CsrWifiSmeTspecIndDes(u8 *buffer, size_t length)
5322 CsrUint16Des((u16 *) &primitive->tspecLength, buffer, &offset); 5322 CsrUint16Des((u16 *) &primitive->tspecLength, buffer, &offset);
5323 if (primitive->tspecLength) 5323 if (primitive->tspecLength)
5324 { 5324 {
5325 primitive->tspec = (u8 *)CsrPmemAlloc(primitive->tspecLength); 5325 primitive->tspec = kmalloc(primitive->tspecLength, GFP_KERNEL);
5326 CsrMemCpyDes(primitive->tspec, buffer, &offset, ((u16) (primitive->tspecLength))); 5326 CsrMemCpyDes(primitive->tspec, buffer, &offset, ((u16) (primitive->tspecLength)));
5327 } 5327 }
5328 else 5328 else
@@ -5378,7 +5378,7 @@ u8* CsrWifiSmeTspecCfmSer(u8 *ptr, size_t *len, void *msg)
5378 5378
5379void* CsrWifiSmeTspecCfmDes(u8 *buffer, size_t length) 5379void* CsrWifiSmeTspecCfmDes(u8 *buffer, size_t length)
5380{ 5380{
5381 CsrWifiSmeTspecCfm *primitive = (CsrWifiSmeTspecCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeTspecCfm)); 5381 CsrWifiSmeTspecCfm *primitive = kmalloc(sizeof(CsrWifiSmeTspecCfm), GFP_KERNEL);
5382 size_t offset; 5382 size_t offset;
5383 offset = 0; 5383 offset = 0;
5384 5384
@@ -5390,7 +5390,7 @@ void* CsrWifiSmeTspecCfmDes(u8 *buffer, size_t length)
5390 CsrUint16Des((u16 *) &primitive->tspecLength, buffer, &offset); 5390 CsrUint16Des((u16 *) &primitive->tspecLength, buffer, &offset);
5391 if (primitive->tspecLength) 5391 if (primitive->tspecLength)
5392 { 5392 {
5393 primitive->tspec = (u8 *)CsrPmemAlloc(primitive->tspecLength); 5393 primitive->tspec = kmalloc(primitive->tspecLength, GFP_KERNEL);
5394 CsrMemCpyDes(primitive->tspec, buffer, &offset, ((u16) (primitive->tspecLength))); 5394 CsrMemCpyDes(primitive->tspec, buffer, &offset, ((u16) (primitive->tspecLength)));
5395 } 5395 }
5396 else 5396 else
@@ -5451,7 +5451,7 @@ u8* CsrWifiSmeVersionsGetCfmSer(u8 *ptr, size_t *len, void *msg)
5451 5451
5452void* CsrWifiSmeVersionsGetCfmDes(u8 *buffer, size_t length) 5452void* CsrWifiSmeVersionsGetCfmDes(u8 *buffer, size_t length)
5453{ 5453{
5454 CsrWifiSmeVersionsGetCfm *primitive = (CsrWifiSmeVersionsGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeVersionsGetCfm)); 5454 CsrWifiSmeVersionsGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeVersionsGetCfm), GFP_KERNEL);
5455 size_t offset; 5455 size_t offset;
5456 offset = 0; 5456 offset = 0;
5457 5457
@@ -5521,7 +5521,7 @@ u8* CsrWifiSmeCloakedSsidsGetCfmSer(u8 *ptr, size_t *len, void *msg)
5521 5521
5522void* CsrWifiSmeCloakedSsidsGetCfmDes(u8 *buffer, size_t length) 5522void* CsrWifiSmeCloakedSsidsGetCfmDes(u8 *buffer, size_t length)
5523{ 5523{
5524 CsrWifiSmeCloakedSsidsGetCfm *primitive = (CsrWifiSmeCloakedSsidsGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeCloakedSsidsGetCfm)); 5524 CsrWifiSmeCloakedSsidsGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeCloakedSsidsGetCfm), GFP_KERNEL);
5525 size_t offset; 5525 size_t offset;
5526 offset = 0; 5526 offset = 0;
5527 5527
@@ -5531,7 +5531,7 @@ void* CsrWifiSmeCloakedSsidsGetCfmDes(u8 *buffer, size_t length)
5531 primitive->cloakedSsids.cloakedSsids = NULL; 5531 primitive->cloakedSsids.cloakedSsids = NULL;
5532 if (primitive->cloakedSsids.cloakedSsidsCount) 5532 if (primitive->cloakedSsids.cloakedSsidsCount)
5533 { 5533 {
5534 primitive->cloakedSsids.cloakedSsids = (CsrWifiSsid *)CsrPmemAlloc(sizeof(CsrWifiSsid) * primitive->cloakedSsids.cloakedSsidsCount); 5534 primitive->cloakedSsids.cloakedSsids = kmalloc(sizeof(CsrWifiSsid) * primitive->cloakedSsids.cloakedSsidsCount, GFP_KERNEL);
5535 } 5535 }
5536 { 5536 {
5537 u16 i2; 5537 u16 i2;
@@ -5576,7 +5576,7 @@ u8* CsrWifiSmeWifiOnIndSer(u8 *ptr, size_t *len, void *msg)
5576 5576
5577void* CsrWifiSmeWifiOnIndDes(u8 *buffer, size_t length) 5577void* CsrWifiSmeWifiOnIndDes(u8 *buffer, size_t length)
5578{ 5578{
5579 CsrWifiSmeWifiOnInd *primitive = (CsrWifiSmeWifiOnInd *) CsrPmemAlloc(sizeof(CsrWifiSmeWifiOnInd)); 5579 CsrWifiSmeWifiOnInd *primitive = kmalloc(sizeof(CsrWifiSmeWifiOnInd), GFP_KERNEL);
5580 size_t offset; 5580 size_t offset;
5581 offset = 0; 5581 offset = 0;
5582 5582
@@ -5617,7 +5617,7 @@ u8* CsrWifiSmeSmeCommonConfigGetCfmSer(u8 *ptr, size_t *len, void *msg)
5617 5617
5618void* CsrWifiSmeSmeCommonConfigGetCfmDes(u8 *buffer, size_t length) 5618void* CsrWifiSmeSmeCommonConfigGetCfmDes(u8 *buffer, size_t length)
5619{ 5619{
5620 CsrWifiSmeSmeCommonConfigGetCfm *primitive = (CsrWifiSmeSmeCommonConfigGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeSmeCommonConfigGetCfm)); 5620 CsrWifiSmeSmeCommonConfigGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeSmeCommonConfigGetCfm), GFP_KERNEL);
5621 size_t offset; 5621 size_t offset;
5622 offset = 0; 5622 offset = 0;
5623 5623
@@ -5658,7 +5658,7 @@ u8* CsrWifiSmeInterfaceCapabilityGetCfmSer(u8 *ptr, size_t *len, void *msg)
5658 5658
5659void* CsrWifiSmeInterfaceCapabilityGetCfmDes(u8 *buffer, size_t length) 5659void* CsrWifiSmeInterfaceCapabilityGetCfmDes(u8 *buffer, size_t length)
5660{ 5660{
5661 CsrWifiSmeInterfaceCapabilityGetCfm *primitive = (CsrWifiSmeInterfaceCapabilityGetCfm *) CsrPmemAlloc(sizeof(CsrWifiSmeInterfaceCapabilityGetCfm)); 5661 CsrWifiSmeInterfaceCapabilityGetCfm *primitive = kmalloc(sizeof(CsrWifiSmeInterfaceCapabilityGetCfm), GFP_KERNEL);
5662 size_t offset; 5662 size_t offset;
5663 offset = 0; 5663 offset = 0;
5664 5664
@@ -5694,7 +5694,7 @@ u8* CsrWifiSmeErrorIndSer(u8 *ptr, size_t *len, void *msg)
5694 5694
5695void* CsrWifiSmeErrorIndDes(u8 *buffer, size_t length) 5695void* CsrWifiSmeErrorIndDes(u8 *buffer, size_t length)
5696{ 5696{
5697 CsrWifiSmeErrorInd *primitive = (CsrWifiSmeErrorInd *) CsrPmemAlloc(sizeof(CsrWifiSmeErrorInd)); 5697 CsrWifiSmeErrorInd *primitive = kmalloc(sizeof(CsrWifiSmeErrorInd), GFP_KERNEL);
5698 size_t offset; 5698 size_t offset;
5699 offset = 0; 5699 offset = 0;
5700 5700
@@ -5736,7 +5736,7 @@ u8* CsrWifiSmeInfoIndSer(u8 *ptr, size_t *len, void *msg)
5736 5736
5737void* CsrWifiSmeInfoIndDes(u8 *buffer, size_t length) 5737void* CsrWifiSmeInfoIndDes(u8 *buffer, size_t length)
5738{ 5738{
5739 CsrWifiSmeInfoInd *primitive = (CsrWifiSmeInfoInd *) CsrPmemAlloc(sizeof(CsrWifiSmeInfoInd)); 5739 CsrWifiSmeInfoInd *primitive = kmalloc(sizeof(CsrWifiSmeInfoInd), GFP_KERNEL);
5740 size_t offset; 5740 size_t offset;
5741 offset = 0; 5741 offset = 0;
5742 5742
@@ -5783,7 +5783,7 @@ u8* CsrWifiSmeCoreDumpIndSer(u8 *ptr, size_t *len, void *msg)
5783 5783
5784void* CsrWifiSmeCoreDumpIndDes(u8 *buffer, size_t length) 5784void* CsrWifiSmeCoreDumpIndDes(u8 *buffer, size_t length)
5785{ 5785{
5786 CsrWifiSmeCoreDumpInd *primitive = (CsrWifiSmeCoreDumpInd *) CsrPmemAlloc(sizeof(CsrWifiSmeCoreDumpInd)); 5786 CsrWifiSmeCoreDumpInd *primitive = kmalloc(sizeof(CsrWifiSmeCoreDumpInd), GFP_KERNEL);
5787 size_t offset; 5787 size_t offset;
5788 offset = 0; 5788 offset = 0;
5789 5789
@@ -5791,7 +5791,7 @@ void* CsrWifiSmeCoreDumpIndDes(u8 *buffer, size_t length)
5791 CsrUint32Des((u32 *) &primitive->dataLength, buffer, &offset); 5791 CsrUint32Des((u32 *) &primitive->dataLength, buffer, &offset);
5792 if (primitive->dataLength) 5792 if (primitive->dataLength)
5793 { 5793 {
5794 primitive->data = (u8 *)CsrPmemAlloc(primitive->dataLength); 5794 primitive->data = kmalloc(primitive->dataLength, GFP_KERNEL);
5795 CsrMemCpyDes(primitive->data, buffer, &offset, ((u16) (primitive->dataLength))); 5795 CsrMemCpyDes(primitive->data, buffer, &offset, ((u16) (primitive->dataLength)));
5796 } 5796 }
5797 else 5797 else
diff --git a/drivers/staging/csr/drv.c b/drivers/staging/csr/drv.c
index 6f5b3dd7ce1f..b2c27f4f03d4 100644
--- a/drivers/staging/csr/drv.c
+++ b/drivers/staging/csr/drv.c
@@ -1483,7 +1483,7 @@ unifi_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
1483 break; 1483 break;
1484 } 1484 }
1485 1485
1486 pcli->snap_filter.protocols = CsrPmemAlloc(snap_filter.count * sizeof(u16)); 1486 pcli->snap_filter.protocols = kmalloc(snap_filter.count * sizeof(u16), GFP_KERNEL);
1487 if (!pcli->snap_filter.protocols) { 1487 if (!pcli->snap_filter.protocols) {
1488 r = -ENOMEM; 1488 r = -ENOMEM;
1489 goto out; 1489 goto out;
diff --git a/drivers/staging/csr/putest.c b/drivers/staging/csr/putest.c
index f2cb11e1b210..5613cf0e16b0 100644
--- a/drivers/staging/csr/putest.c
+++ b/drivers/staging/csr/putest.c
@@ -489,7 +489,7 @@ int unifi_putest_dl_fw_buff(unifi_priv_t *priv, unsigned char *arg)
489 } 489 }
490 490
491 /* Buffer for kernel copy of the f/w image */ 491 /* Buffer for kernel copy of the f/w image */
492 fw_buf = CsrPmemAlloc(fw_length); 492 fw_buf = kmalloc(fw_length, GFP_KERNEL);
493 if (!fw_buf) { 493 if (!fw_buf) {
494 unifi_error(priv, "unifi_putest_dl_fw_buff: malloc fail\n"); 494 unifi_error(priv, "unifi_putest_dl_fw_buff: malloc fail\n");
495 return -ENOMEM; 495 return -ENOMEM;
diff --git a/drivers/staging/csr/sme_mgt.c b/drivers/staging/csr/sme_mgt.c
index e252883d70eb..58d1b3b72932 100644
--- a/drivers/staging/csr/sme_mgt.c
+++ b/drivers/staging/csr/sme_mgt.c
@@ -141,7 +141,7 @@ void CsrWifiSmeScanResultsGetCfmHandler(void* drvpriv, CsrWifiFsmEvent* msg)
141 } 141 }
142 142
143 /* Take a Copy of the scan Results :-) */ 143 /* Take a Copy of the scan Results :-) */
144 scanCopy = CsrPmemAlloc(bytesRequired); 144 scanCopy = kmalloc(bytesRequired, GFP_KERNEL);
145 memcpy(scanCopy, cfm->scanResults, sizeof(CsrWifiSmeScanResult) * cfm->scanResultsCount); 145 memcpy(scanCopy, cfm->scanResults, sizeof(CsrWifiSmeScanResult) * cfm->scanResultsCount);
146 146
147 /* Take a Copy of the Info Elements AND update the scan result pointers */ 147 /* Take a Copy of the Info Elements AND update the scan result pointers */
diff --git a/drivers/staging/csr/ul_int.c b/drivers/staging/csr/ul_int.c
index d8a728b1a1b2..46d3507fd8f1 100644
--- a/drivers/staging/csr/ul_int.c
+++ b/drivers/staging/csr/ul_int.c
@@ -105,15 +105,14 @@ ul_register_client(unifi_priv_t *priv, unsigned int configuration,
105 ul_clients[id].configuration = configuration; 105 ul_clients[id].configuration = configuration;
106 106
107 /* Allocate memory for the reply signal.. */ 107 /* Allocate memory for the reply signal.. */
108 ul_clients[id].reply_signal = (CSR_SIGNAL*) CsrPmemAlloc(sizeof(CSR_SIGNAL)); 108 ul_clients[id].reply_signal = kmalloc(sizeof(CSR_SIGNAL), GFP_KERNEL);
109 if (ul_clients[id].reply_signal == NULL) { 109 if (ul_clients[id].reply_signal == NULL) {
110 unifi_error(priv, "Failed to allocate reply signal for client.\n"); 110 unifi_error(priv, "Failed to allocate reply signal for client.\n");
111 return NULL; 111 return NULL;
112 } 112 }
113 /* .. and the bulk data of the reply signal. */ 113 /* .. and the bulk data of the reply signal. */
114 for (ref = 0; ref < UNIFI_MAX_DATA_REFERENCES; ref ++) { 114 for (ref = 0; ref < UNIFI_MAX_DATA_REFERENCES; ref ++) {
115 ul_clients[id].reply_bulkdata[ref] = 115 ul_clients[id].reply_bulkdata[ref] = kmalloc(sizeof(bulk_data_t), GFP_KERNEL);
116 (bulk_data_t*) CsrPmemAlloc(sizeof(bulk_data_t));
117 /* If allocation fails, free allocated memory. */ 116 /* If allocation fails, free allocated memory. */
118 if (ul_clients[id].reply_bulkdata[ref] == NULL) { 117 if (ul_clients[id].reply_bulkdata[ref] == NULL) {
119 for (; ref > 0; ref --) { 118 for (; ref > 0; ref --) {
diff --git a/drivers/staging/csr/unifi_sme.c b/drivers/staging/csr/unifi_sme.c
index 0cb7b0145eda..ff639d47d07b 100644
--- a/drivers/staging/csr/unifi_sme.c
+++ b/drivers/staging/csr/unifi_sme.c
@@ -411,7 +411,7 @@ uf_multicast_list_wq(struct work_struct *work)
411 * Allocate a new list, need to free it later 411 * Allocate a new list, need to free it later
412 * in unifi_mgt_multicast_address_cfm(). 412 * in unifi_mgt_multicast_address_cfm().
413 */ 413 */
414 multicast_address_list = CsrPmemAlloc(mc_count * sizeof(CsrWifiMacAddress)); 414 multicast_address_list = kmalloc(mc_count * sizeof(CsrWifiMacAddress), GFP_KERNEL);
415 415
416 if (multicast_address_list == NULL) { 416 if (multicast_address_list == NULL) {
417 return; 417 return;
@@ -590,7 +590,7 @@ int unifi_cfg_packet_filters(unifi_priv_t *priv, unsigned char *arg)
590 priv->packet_filters.tclas_ies_length += sizeof(tclas_t); 590 priv->packet_filters.tclas_ies_length += sizeof(tclas_t);
591 } 591 }
592 if (priv->packet_filters.tclas_ies_length > 0) { 592 if (priv->packet_filters.tclas_ies_length > 0) {
593 priv->filter_tclas_ies = CsrPmemAlloc(priv->packet_filters.tclas_ies_length); 593 priv->filter_tclas_ies = kmalloc(priv->packet_filters.tclas_ies_length, GFP_KERNEL);
594 if (priv->filter_tclas_ies == NULL) { 594 if (priv->filter_tclas_ies == NULL) {
595 return -ENOMEM; 595 return -ENOMEM;
596 } 596 }
@@ -671,7 +671,7 @@ int unifi_cfg_wmm_addts(unifi_priv_t *priv, unsigned char *arg)
671 unifi_trace(priv, UDBG4, "addts: tid = 0x%x ie_length = %d\n", 671 unifi_trace(priv, UDBG4, "addts: tid = 0x%x ie_length = %d\n",
672 addts_tid, addts_ie_length); 672 addts_tid, addts_ie_length);
673 673
674 addts_ie = CsrPmemAlloc(addts_ie_length); 674 addts_ie = kmalloc(addts_ie_length, GFP_KERNEL);
675 if (addts_ie == NULL) { 675 if (addts_ie == NULL) {
676 unifi_error(priv, 676 unifi_error(priv,
677 "unifi_cfg_wmm_addts: Failed to malloc %d bytes for addts_ie buffer\n", 677 "unifi_cfg_wmm_addts: Failed to malloc %d bytes for addts_ie buffer\n",
@@ -1209,7 +1209,7 @@ void uf_send_pkt_to_encrypt(struct work_struct *work)
1209 pktBulkDataLength = interfacePriv->wapi_unicast_bulk_data.data_length; 1209 pktBulkDataLength = interfacePriv->wapi_unicast_bulk_data.data_length;
1210 1210
1211 if (pktBulkDataLength > 0) { 1211 if (pktBulkDataLength > 0) {
1212 pktBulkData = (u8 *)CsrPmemAlloc(pktBulkDataLength); 1212 pktBulkData = kmalloc(pktBulkDataLength, GFP_KERNEL);
1213 memset(pktBulkData, 0, pktBulkDataLength); 1213 memset(pktBulkData, 0, pktBulkDataLength);
1214 } else { 1214 } else {
1215 unifi_error(priv, "uf_send_pkt_to_encrypt() : invalid buffer\n"); 1215 unifi_error(priv, "uf_send_pkt_to_encrypt() : invalid buffer\n");
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-11 09:21:57 -0400