Index: /branches/rel_apv_10_4_0_112_gail/usr/src/sys/click/app/qos/qos_subr.c
===================================================================
--- /branches/rel_apv_10_4_0_112_gail/usr/src/sys/click/app/qos/qos_subr.c	(revision 38493)
+++ /branches/rel_apv_10_4_0_112_gail/usr/src/sys/click/app/qos/qos_subr.c	(working copy)
@@ -406,11 +406,16 @@
 {
 
 	delete_qos_session_config (pcb, QOS_NAME_FOR_ALL);
-        current_dyn_q_count = 0;
 	disable_session (pcb);
+	if (current_dyn_q_count > 0) {
+		app_printf(pcb,"Reboot required to clear the default and"
+			" internally created QoS session queues\n");
+		return QOS_SUCCESS;
+	}
+
 	/* bug 14949, qiuzj, http qos */
 	clear_qos_http_url(pcb);
-    
+ 
 	qos_filter_clear_all(pcb);
 	qos_interface_clear_all(pcb);