From 6c4d4c70c6618fc84fc815d14c92ea60f0be538e Mon Sep 17 00:00:00 2001
From: Qiang Huang <h.huangqiang@huawei.com>
Date: Fri, 14 Aug 2015 14:38:48 +0800
Subject: [PATCH] Adapt CONFIG_NETPRIO_CGROUP in check-config.sh

Fixes: #15572

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
---
 contrib/check-config.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/contrib/check-config.sh b/contrib/check-config.sh
index 9b2ede1372..c0604c347a 100755
--- a/contrib/check-config.sh
+++ b/contrib/check-config.sh
@@ -191,11 +191,17 @@ if [ "$kernelMajor" -lt 3 ] || [ "$kernelMajor" -eq 3 -a "$kernelMinor" -le 18 ]
 	check_flags RESOURCE_COUNTERS
 fi
 
+if [ "$kernelMajor" -lt 3 ] || [ "$kernelMajor" -eq 3 -a "$kernelMinor" -le 13 ]; then
+	netprio=NETPRIO_CGROUP
+else
+	netprio=CGROUP_NET_PRIO
+fi
+
 flags=(
 	BLK_CGROUP IOSCHED_CFQ
 	CGROUP_PERF
 	CGROUP_HUGETLB
-	NET_CLS_CGROUP NETPRIO_CGROUP
+	NET_CLS_CGROUP $netprio
 	CFS_BANDWIDTH FAIR_GROUP_SCHED RT_GROUP_SCHED
 )
 check_flags "${flags[@]}"