diff --git a/qdf/inc/qdf_trace.h b/qdf/inc/qdf_trace.h
index ae6ba2c311..53880327f9 100644
--- a/qdf/inc/qdf_trace.h
+++ b/qdf/inc/qdf_trace.h
@@ -53,6 +53,9 @@
 #define QDF_DEFAULT_TRACE_LEVEL (1 << QDF_TRACE_LEVEL_INFO)
 #endif
 
+#define QDF_CATEGORY_INFO_U16(val) (((val >> 16) & 0x0000FFFF))
+#define QDF_TRACE_LEVEL_INFO_L16(val) (val & 0x0000FFFF)
+
 typedef int (qdf_abstract_print)(void *priv, const char *fmt, ...);
 
 /*
@@ -67,19 +70,6 @@ typedef int (qdf_abstract_print)(void *priv, const char *fmt, ...);
 #define QDF_DEBUG_CFG           0x40
 
 #ifdef CONFIG_MCL
-/**
- * qdf_set_pidx() - Sets the global qdf_pidx.
- * @pidx : Index of print control object assigned to the module
- *
- */
-void qdf_set_pidx(int pidx);
-
-/**
- * qdf_get_pidx() - Returns the global qdf_pidx.
- *
- * Return : Current qdf print index.
- */
-int qdf_get_pidx(void);
 
 /* By default Data Path module will have all log levels enabled, except debug
  * log level. Debug level will be left up to the framework or user space modules
@@ -545,10 +535,24 @@ qdf_tso_seg_dbg_zero(struct qdf_tso_seg_elem_t *tsoseg)
 
 #define MAX_SUPPORTED_CATEGORY QDF_MODULE_ID_MAX
 
+/**
+ * qdf_set_pidx() - Sets the global qdf_pidx.
+ * @pidx : Index of print control object assigned to the module
+ *
+ */
+void qdf_set_pidx(int pidx);
+
+/**
+ * qdf_get_pidx() - Returns the global qdf_pidx.
+ *
+ * Return : Current qdf print index.
+ */
+int qdf_get_pidx(void);
 /*
  * Shared print control index
  * for converged debug framework
  */
+
 #define QDF_PRINT_IDX_SHARED -1
 
 /**
diff --git a/qdf/linux/src/qdf_trace.c b/qdf/linux/src/qdf_trace.c
index 40b7c8ec71..ac07064422 100644
--- a/qdf/linux/src/qdf_trace.c
+++ b/qdf/linux/src/qdf_trace.c
@@ -129,18 +129,6 @@ static struct s_qdf_dp_trace_data g_qdf_dp_trace_data;
 static tp_qdf_dp_trace_cb qdf_dp_trace_cb_table[QDF_DP_TRACE_MAX+1];
 #endif
 
-void qdf_set_pidx(int pidx)
-{
-	qdf_pidx = pidx;
-}
-EXPORT_SYMBOL(qdf_set_pidx);
-
-int qdf_get_pidx(void)
-{
-	return qdf_pidx;
-}
-EXPORT_SYMBOL(qdf_get_pidx);
-
 /**
  * qdf_trace_set_level() - Set the trace level for a particular module
  * @module: Module id
@@ -1814,6 +1802,7 @@ struct category_name_info g_qdf_category_name[MAX_SUPPORTED_CATEGORY] = {
 	[QDF_MODULE_ID_OFFCHAN_TXRX] = {"OFFCHAN"},
 	[QDF_MODULE_ID_ANY] = {"ANY"},
 };
+EXPORT_SYMBOL(g_qdf_category_name);
 
 
 #ifdef CONFIG_MCL
@@ -1989,6 +1978,13 @@ int qdf_print_ctrl_register(const struct category_info *cinfo,
 			    QDF_TRACE_LEVEL_ALL) {
 				print_ctrl_obj[idx].cat_info[i]
 				.category_verbose_mask = 0xFFFF;
+			} else if ((cinfo[i].category_verbose_mask ==
+				   QDF_TRACE_LEVEL_NONE) ||
+				   (cinfo[i].category_verbose_mask ==
+				   QDF_TRACE_LEVEL_TO_MODULE_BITMASK(
+				   QDF_TRACE_LEVEL_NONE))) {
+				print_ctrl_obj[idx].cat_info[i]
+				.category_verbose_mask = 0;
 			} else {
 				print_ctrl_obj[idx].cat_info[i]
 				.category_verbose_mask =
@@ -2499,3 +2495,15 @@ int qdf_sprint_symbol(char *buffer, void *addr)
 }
 #endif
 EXPORT_SYMBOL(qdf_sprint_symbol);
+
+void qdf_set_pidx(int pidx)
+{
+	qdf_pidx = pidx;
+}
+EXPORT_SYMBOL(qdf_set_pidx);
+
+int qdf_get_pidx(void)
+{
+	return qdf_pidx;
+}
+EXPORT_SYMBOL(qdf_get_pidx);