From 523a29ed1e50ac66a06456d78f82d4c6a12d2ab3 Mon Sep 17 00:00:00 2001 From: Arend van Spriel Date: Wed, 29 Jun 2011 16:47:26 -0700 Subject: [PATCH] staging: brcm80211: remove ARP_OFFLOAD_SUPPORT macro definition The conditional code for ARP offloading is now always enabled in the fullmac driver. Signed-off-by: Arend van Spriel Reviewed-by: Roland Vossen Reviewed-by: Franky Lin Signed-off-by: Greg Kroah-Hartman --- drivers/staging/brcm80211/brcmfmac/Makefile | 1 - drivers/staging/brcm80211/brcmfmac/dhd_common.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/drivers/staging/brcm80211/brcmfmac/Makefile b/drivers/staging/brcm80211/brcmfmac/Makefile index 07b93406e3c3..8a7cbf321cfa 100644 --- a/drivers/staging/brcm80211/brcmfmac/Makefile +++ b/drivers/staging/brcm80211/brcmfmac/Makefile @@ -16,7 +16,6 @@ # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ccflags-y := \ - -DARP_OFFLOAD_SUPPORT \ -DBCMLXSDMMC \ -DBCMPLATFORM_BUS \ -DBCMSDIO \ diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_common.c b/drivers/staging/brcm80211/brcmfmac/dhd_common.c index deb8566bbecd..8f593cfa8124 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_common.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_common.c @@ -1283,12 +1283,10 @@ int brcmf_c_preinit_ioctls(dhd_pub_t *dhd) brcmf_proto_cdc_set_ioctl(dhd, 0, BRCMF_C_SET_SCAN_UNASSOC_TIME, (char *)&scan_unassoc_time, sizeof(scan_unassoc_time)); -#ifdef ARP_OFFLOAD_SUPPORT /* Set and enable ARP offload feature */ if (brcmf_arp_enable) brcmf_c_arp_offload_set(dhd, brcmf_arp_mode); brcmf_c_arp_offload_enable(dhd, brcmf_arp_enable); -#endif /* ARP_OFFLOAD_SUPPORT */ #ifdef PKT_FILTER_SUPPORT {