Ver código fonte

Merge pull request #15580 from hqhq/hq_fix_NETPRIO_check

Adapt CONFIG_NETPRIO_CGROUP in check-config.sh
Tianon Gravi 10 anos atrás
pai
commit
53b1f993ab
1 arquivos alterados com 7 adições e 1 exclusões
  1. 7 1
      contrib/check-config.sh

+ 7 - 1
contrib/check-config.sh

@@ -191,11 +191,17 @@ if [ "$kernelMajor" -lt 3 ] || [ "$kernelMajor" -eq 3 -a "$kernelMinor" -le 18 ]
 	check_flags RESOURCE_COUNTERS
 	check_flags RESOURCE_COUNTERS
 fi
 fi
 
 
+if [ "$kernelMajor" -lt 3 ] || [ "$kernelMajor" -eq 3 -a "$kernelMinor" -le 13 ]; then
+	netprio=NETPRIO_CGROUP
+else
+	netprio=CGROUP_NET_PRIO
+fi
+
 flags=(
 flags=(
 	BLK_CGROUP IOSCHED_CFQ
 	BLK_CGROUP IOSCHED_CFQ
 	CGROUP_PERF
 	CGROUP_PERF
 	CGROUP_HUGETLB
 	CGROUP_HUGETLB
-	NET_CLS_CGROUP NETPRIO_CGROUP
+	NET_CLS_CGROUP $netprio
 	CFS_BANDWIDTH FAIR_GROUP_SCHED RT_GROUP_SCHED
 	CFS_BANDWIDTH FAIR_GROUP_SCHED RT_GROUP_SCHED
 )
 )
 check_flags "${flags[@]}"
 check_flags "${flags[@]}"