diff --git a/scheduler/inc/scheduler_api.h b/scheduler/inc/scheduler_api.h
index 4d9fabd837..4619d491ca 100644
--- a/scheduler/inc/scheduler_api.h
+++ b/scheduler/inc/scheduler_api.h
@@ -62,12 +62,12 @@ typedef enum {
  * struct scheduler_msg: scheduler message structure
  * @type: message type
  * @reserved: reserved field
+ * @bodyval: message body val
  * @bodyptr: message body pointer based on the type either a bodyptr pointer
  *     into memory or bodyval as a 32 bit data is used. bodyptr is always a
  *     freeable pointer, one should always make sure that bodyptr is always
  *     freeable.
  * Messages should use either bodyptr or bodyval; not both !!!
- * @bodyval: message body val
  * @callback: callback to be called by scheduler thread once message is posted
  *   and scheduler thread has started processing the message.
  * @flush_callback: flush callback which will be invoked during driver unload
@@ -79,8 +79,8 @@ typedef enum {
 struct scheduler_msg {
 	uint16_t type;
 	uint16_t reserved;
-	void *bodyptr;
 	uint32_t bodyval;
+	void *bodyptr;
 	void *callback;
 	void *flush_callback;
 };
diff --git a/scheduler/inc/scheduler_core.h b/scheduler/inc/scheduler_core.h
index fcdf15409a..191a6eceaa 100644
--- a/scheduler/inc/scheduler_core.h
+++ b/scheduler/inc/scheduler_core.h
@@ -32,7 +32,11 @@
 #include <scheduler_api.h>
 #include <qdf_list.h>
 
+#ifdef CONFIG_MCL
 #define SCHEDULER_CORE_MAX_MESSAGES 8000
+#else
+#define SCHEDULER_CORE_MAX_MESSAGES 2000
+#endif
 #define SCHEDULER_NUMBER_OF_MSG_QUEUE 5
 #define SCHEDULER_WRAPPER_MAX_FAIL_COUNT (SCHEDULER_CORE_MAX_MESSAGES * 3)
 #define SCHEDULER_WATCHDOG_TIMEOUT (10 * 1000) /* 10s */