From 27ea4962a0c01dabcc30d719701386a66375d8c5 Mon Sep 17 00:00:00 2001 From: Alok Makhariya Date: Tue, 1 Apr 2014 15:01:39 +0530 Subject: 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 Reviewed-on: http://git.am.freescale.net:8181/10535 Tested-by: Review Code-CDREVIEW Reviewed-by: Rajan Gupta Reviewed-by: Jose Rivera 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 diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index e69add3..95d70de 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -517,7 +517,7 @@ struct sk_buff { __be16 inner_protocol; __u16 inner_transport_header; __u16 inner_network_header; -#ifdef CONFIG_RX_TX_BUFF_XCHG +#if defined(CONFIG_GIANFAR) && defined(CONFIG_AS_FASTPATH) __u8 owner; struct sk_buff *new_skb; #endif -- cgit v0.10.2