summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
authorAlok Makhariya <B46187@freescale.com>2014-04-01 09:31:39 (GMT)
committerJose Rivera <German.Rivera@freescale.com>2014-04-01 16:20:36 (GMT)
commit27ea4962a0c01dabcc30d719701386a66375d8c5 (patch)
treeda3d8d628775ea8ab3f1b4dc1e84e17aac447da4 /drivers/net/ethernet
parentcf42c0223c36e5fc2bc99ac01a7dec2ba5ccfec6 (diff)
downloadlinux-fsl-qoriq-27ea4962a0c01dabcc30d719701386a66375d8c5.tar.xz
gianfar: asf_gianfar will compile when CONFIG_GIANFAR is set.
asf_gianfar will compile only when CONFIG_GIANFAR and CONFIG_AS_FASTPATH are set. Replacing CONFIG_RX_TX_BUFF_XCHG with CONFIG_AS_FASTPATH and CONFIG_GIANFAR in skbuff structure of skbuff.h Removing CONFIG_RX_TX_BUFF_XCHG flag from kconfig. Change-Id: Iba0da980dfb807808cb3f9cd7d18a0229fa96b35 CR:ENGR00306399 Signed-off-by: Alok Makhariya <B46187@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/10535 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Rajan Gupta <rajan.gupta@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r--drivers/net/ethernet/freescale/Kconfig8
-rw-r--r--drivers/net/ethernet/freescale/Makefile4
2 files changed, 3 insertions, 9 deletions
diff --git a/drivers/net/ethernet/freescale/Kconfig b/drivers/net/ethernet/freescale/Kconfig
index eaf45a8..80c9bb7 100644
--- a/drivers/net/ethernet/freescale/Kconfig
+++ b/drivers/net/ethernet/freescale/Kconfig
@@ -104,14 +104,6 @@ config FSL_GIANFAR_1588
The user space application should be IXXAT IEEE 1588 stack v1.04 or above.
Say Y here if you want to use IXXAT 1588 stack.
-config RX_TX_BUFF_XCHG
- default y
- bool "RX and TX ring buffer exchange for Routed packets"
- depends on GIANFAR && AS_FASTPATH
- ---help---
- Enable this flag to get better throughput for the routing functionality.
- Enhances the performance for IPv4 Routing, NAT forwarding.
-
source "drivers/net/ethernet/freescale/fman/Kconfig"
source "drivers/net/ethernet/freescale/dpa/Kconfig"
diff --git a/drivers/net/ethernet/freescale/Makefile b/drivers/net/ethernet/freescale/Makefile
index d97eff5..4fff029 100644
--- a/drivers/net/ethernet/freescale/Makefile
+++ b/drivers/net/ethernet/freescale/Makefile
@@ -17,7 +17,9 @@ obj-$(if $(CONFIG_FSL_DPAA_ETH),y) += dpa/
obj-$(CONFIG_PTP_1588_CLOCK_GIANFAR) += gianfar_ptp.o
gianfar_driver-objs := gianfar.o \
gianfar_ethtool.o
-obj-$(CONFIG_AS_FASTPATH) += asf_gianfar.o
+ifeq ($(CONFIG_GIANFAR),y)
+ obj-$(CONFIG_AS_FASTPATH) += asf_gianfar.o
+endif
gianfar_driver-$(CONFIG_FSL_GIANFAR_1588) += gianfar_1588.o
obj-$(CONFIG_UCC_GETH) += ucc_geth_driver.o
ucc_geth_driver-objs := ucc_geth.o ucc_geth_ethtool.o