From 03dd666d9efb8e3ec8592a2e3bd709e700ba5727 Mon Sep 17 00:00:00 2001
From: Alok Makhariya <B46187@freescale.com>
Date: Fri, 23 Oct 2015 15:00:29 +0530
Subject: kconfig-asf : asf_qos disabled with asf by default

asf_qos feature to be only available for non-dpaa platform
asf_qos will not be enabled by enabling ASF.
asf_linux_qos may be used for dpaa platforms.

Signed-off-by: Alok Makhariya <B46187@freescale.com>

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index ff1e2a0..9e35d1b 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -90,10 +90,27 @@ config ASF_IPV6
 	  This option compiles the ASF for IPV6
 	  Firewall and IPsec.
 
+config ASF_LINUX_QOS
+	default n
+	bool "ASF Linux QoS Integration"
+	depends on AS_FASTPATH
+	select NETFILTER_XT_TARGET_DSCP
+	select NET_SCHED
+	select NET_SCH_PRIO
+	select NET_SCH_TBF
+	select NET_SCH_DRR
+	select NET_CLS
+	select NET_CLS_BASIC
+	select NET_CLS_U32
+	select NET_CLS_FLOW
+	select NET_SCH_FIFO
+	select IP_NF_MANGLE
+	select IP6_NF_MANGLE
+
 config ASF_QOS
-	default y
+	default n
 	bool "ASF QoS Support"
-	depends on AS_FASTPATH
+	depends on AS_FASTPATH && !ASF_LINUX_QOS && !FSL_DPAA_ETH
 	select NETFILTER_XT_TARGET_DSCP
 	select NET_SCHED
 	select NET_SCH_PRIO
@@ -114,23 +131,29 @@ config ASF_EGRESS_QOS
 
 config ASF_INGRESS_MARKER
 	default y
-	bool "DSCP Marking Support"
-	depends on ASF_QOS && ASF_EGRESS_QOS
+	bool "ASF DSCP Marking Support"
+	depends on AS_FASTPATH
+	depends on ASF_QOS
 	---help---
-	  Choose this option if you wish to utilize ASF Marking support.
-	  Currently only DSCP marking is supported.
+	  Choose this option if you wish to utilize
+	  ASF Marking support.
+	  Currently only DSCP marking
+          is supported.
 
 config ASF_EGRESS_SCH
 	default y
-	bool "S/W Scheduler Support"
-	depends on ASF_QOS && ASF_EGRESS_QOS && !DPA_ETH
+	bool "ASF S/W Scheduler Support"
+	depends on ASF_QOS && ASF_EGRESS_QOS && !FSL_DPAA_ETH
 	---help---
-	  Choose this option if you wish to utilize ASF S/W based Scheduler support.
+	  Choose this option
+	  if you wish to utilize
+	  ASF S/W based
+	  Scheduler support.
 
 config ASF_EGRESS_SHAPER
 	default y
-	bool "S/W Shaper Support"
-	depends on ASF_QOS && ASF_EGRESS_QOS && ASF_EGRESS_SCH && !DPA_ETH
+	bool "ASF S/W Shaper Support"
+	depends on ASF_QOS && ASF_EGRESS_QOS && ASF_EGRESS_SCH && !FSL_DPAA_ETH
 
 	---help---
 	  Choose this option if you wish to utilize ASF S/W based Shaping support.
@@ -148,13 +171,15 @@ choice
 	default ASF_SCH_PRIO
 
 config ASF_SCH_PRIO
-	bool "Strict Priority (PRIO)"
+	bool "ASF Strict Priority (PRIO)"
 	---help---
-	  This option compiles the ASF to utilize eTSEC(NON-DPAA)
-	  H/W Scheduler with PRIORITY algorithm.
+	  This option compiles the ASF
+	  to utilize eTSEC(NON-DPAA) H/W
+	  Scheduler with PRIORITY
+          algorithm.
 
 config ASF_SCH_MWRR
-	bool "Modified Weighted Round-Robin (MWRR)"
+	bool "ASF Modified Weighted Round-Robin (MWRR)"
 	---help---
 	  This option compiles the ASF to utilize eTSEC(NON-DPAA)
 	  H/W Scheduler with Modified Weighted Round-Robin algorithm.
-- 
cgit v0.10.2