From c4fbf9c24430531e6413d20a61bccdb38f16f0c0 Mon Sep 17 00:00:00 2001
From: Franky Lin <frankyl@broadcom.com>
Date: Fri, 16 Sep 2011 12:28:03 -0700
Subject: [PATCH] --- yaml --- r: 268483 b: refs/heads/master c:
 5a8dc2ef78b790854bf67fb688a84e293f70deba h: refs/heads/master i:   268481:
 fae4276836e56bc9e1f4508884f4e146292d1780   268479:
 7b4f898693a97fa94a6c15988e84d1ceb3e5b1a8 v: v3

---
 [refs]                                                |  2 +-
 trunk/drivers/staging/brcm80211/brcmfmac/dhd.h        | 10 ----------
 trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c |  6 +++---
 trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c  |  9 ---------
 4 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/[refs] b/[refs]
index e176f31117d5..f7f18ad47275 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e118503b74da4fdabd3999614df5fbef7c99b71
+refs/heads/master: 5a8dc2ef78b790854bf67fb688a84e293f70deba
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd.h b/trunk/drivers/staging/brcm80211/brcmfmac/dhd.h
index e543640f9627..de3f914d7a4f 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd.h
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/dhd.h
@@ -665,16 +665,6 @@ struct bcmevent_name {
 	const char *name;
 };
 
-/*
- * Insmod parameters for debug/test
- */
-
-/* ARP offload agent mode */
-extern uint brcmf_arp_mode;
-
-/* ARP offload enable */
-extern uint brcmf_arp_enable;
-
 /* Override to force tx queueing all the time */
 extern uint brcmf_force_tx_queueing;
 
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c
index 2e8db6256502..02c022ab9ffa 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c
@@ -30,6 +30,7 @@
 #define DOT11_OUI_LEN			3
 #define BCMILCP_BCM_SUBTYPE_EVENT	1
 #define PKTFILTER_BUF_SIZE		2048
+#define BRCMF_ARPOL_MODE		0xb	/* agent|snoop|peer_autoreply */
 
 int brcmf_msg_level;
 
@@ -859,9 +860,8 @@ int brcmf_c_preinit_ioctls(struct brcmf_pub *drvr)
 			 (char *)&scan_unassoc_time, sizeof(scan_unassoc_time));
 
 	/* Set and enable ARP offload feature */
-	if (brcmf_arp_enable)
-		brcmf_c_arp_offload_set(drvr, brcmf_arp_mode);
-	brcmf_c_arp_offload_enable(drvr, brcmf_arp_enable);
+	brcmf_c_arp_offload_set(drvr, BRCMF_ARPOL_MODE);
+	brcmf_c_arp_offload_enable(drvr, true);
 
 	/* Set up pkt filter */
 	for (i = 0; i < drvr->pktfilter_count; i++) {
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
index 3b2d500ced8e..643c9c20ea91 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
@@ -82,15 +82,6 @@ struct brcmf_info {
 /* Error bits */
 module_param(brcmf_msg_level, int, 0);
 
-/* ARP offload agent mode : Enable ARP Host Auto-Reply
-and ARP Peer Auto-Reply */
-uint brcmf_arp_mode = 0xb;
-module_param(brcmf_arp_mode, uint, 0);
-
-/* ARP offload enable */
-uint brcmf_arp_enable = true;
-module_param(brcmf_arp_enable, uint, 0);
-
 /* Network inteface name */
 char iface_name[IFNAMSIZ] = "wlan";
 module_param_string(iface_name, iface_name, IFNAMSIZ, 0);