From ebdeb8107dfba48700c13a824eb6bf4d551c0696 Mon Sep 17 00:00:00 2001
From: Arend van Spriel <arend@broadcom.com>
Date: Wed, 29 Jun 2011 16:47:26 -0700
Subject: [PATCH] --- yaml --- r: 259794 b: refs/heads/master c:
 523a29ed1e50ac66a06456d78f82d4c6a12d2ab3 h: refs/heads/master v: v3

---
 [refs]                                                | 2 +-
 trunk/drivers/staging/brcm80211/brcmfmac/Makefile     | 1 -
 trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c | 2 --
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index eda4a72c39ed..021cead4828d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d825a8e09f923dfc9af1135654516b7cbafed0f
+refs/heads/master: 523a29ed1e50ac66a06456d78f82d4c6a12d2ab3
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/Makefile b/trunk/drivers/staging/brcm80211/brcmfmac/Makefile
index 07b93406e3c3..8a7cbf321cfa 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/Makefile
+++ b/trunk/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/trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c
index deb8566bbecd..8f593cfa8124 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c
+++ b/trunk/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
 	{