From 01cf1133386f7253a9a6957d0a48ea083a8edd40 Mon Sep 17 00:00:00 2001
From: Rahul <rahul.thakur@iopsys.eu>
Date: Fri, 11 Dec 2020 17:41:29 +0530
Subject: [PATCH] qosmngr: fix regression

Changes to resolve bug #4010 and #4011 are moved to devel as well.

Test: regression run on dg400prime devel, all test pass now
---
 qosmngr/files/lib/qos/broadcom.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/qosmngr/files/lib/qos/broadcom.sh b/qosmngr/files/lib/qos/broadcom.sh
index 4c7d43c6e..e7281627b 100755
--- a/qosmngr/files/lib/qos/broadcom.sh
+++ b/qosmngr/files/lib/qos/broadcom.sh
@@ -161,12 +161,17 @@ handle_queue() {
 		;;
 	esac
 
+	# ignore precedence value in case of WRR
+	if [ $salg -eq 2 ]; then
+	       order=0
+	fi
+
 	# Call tmctl which is a broadcomm command to configure queues on a port.
 	tmctl setqcfg --devtype 0 --if $ifname --qid $Q_COUNT --priority $order --qsize $qsize --weight $wgt --schedmode $salg --shapingrate $rate --burstsize $bs
 
 	# In BCM968 chips, the counters for queues are read, on other model, its read and reset. So, to maintain counter
 	# value and uniform behaviour, we are storing counter value for each queue in files
-	local d_name="/tmp/qos/queue_stats/${ifname}/q_${q_no}"
+	local d_name="/tmp/qos/queue_stats/${ifname}/q_${Q_COUNT}"
 	mkdir $d_name
 	local f_name="$d_name/txPackets"
 	touch $f_name