From 36fb9975d3ee3cd1dc6f5e884658375661da22ce Mon Sep 17 00:00:00 2001
From: Franky Lin <frankyl@broadcom.com>
Date: Fri, 16 Sep 2011 12:27:53 -0700
Subject: [PATCH] --- yaml --- r: 268473 b: refs/heads/master c:
 82553d9ba35a592e3217d8e657d2e6032375fdea h: refs/heads/master i:   268471:
 3a5894f9d862663ec74a0f63f6a3d70f04d42b37 v: v3

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

diff --git a/[refs] b/[refs]
index a18738672603..836863e5ef76 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 818cf60e4d90f934fb12ab4ce718a99481559696
+refs/heads/master: 82553d9ba35a592e3217d8e657d2e6032375fdea
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd.h b/trunk/drivers/staging/brcm80211/brcmfmac/dhd.h
index c35134904ad6..329851ca43b4 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd.h
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/dhd.h
@@ -673,15 +673,6 @@ extern uint brcmf_arp_mode;
 /* ARP offload enable */
 extern uint brcmf_arp_enable;
 
-/* Pkt filte enable control */
-extern uint brcmf_pkt_filter_enable;
-
-/*  Pkt filter init setup */
-extern uint brcmf_pkt_filter_init;
-
-/* Pkt filter mode control */
-extern uint brcmf_master_mode;
-
 /* Roaming mode control */
 extern uint brcmf_roam;
 
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c
index fd39998526af..5ae4a408f75b 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c
@@ -865,15 +865,10 @@ int brcmf_c_preinit_ioctls(struct brcmf_pub *drvr)
 	brcmf_c_arp_offload_enable(drvr, brcmf_arp_enable);
 
 	/* Set up pkt filter */
-	if (brcmf_pkt_filter_enable) {
-		for (i = 0; i < drvr->pktfilter_count; i++) {
-			brcmf_c_pktfilter_offload_set(drvr,
-						  drvr->pktfilter[i]);
-			brcmf_c_pktfilter_offload_enable(drvr,
-			     drvr->pktfilter[i],
-			     brcmf_pkt_filter_init,
-			     brcmf_master_mode);
-		}
+	for (i = 0; i < drvr->pktfilter_count; i++) {
+		brcmf_c_pktfilter_offload_set(drvr, drvr->pktfilter[i]);
+		brcmf_c_pktfilter_offload_enable(drvr, drvr->pktfilter[i],
+						 0, true);
 	}
 
 	brcmf_os_proto_unblock(drvr);
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
index 82868855c7f6..8e729d82e16c 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
@@ -98,18 +98,6 @@ module_param(brcmf_arp_mode, uint, 0);
 uint brcmf_arp_enable = true;
 module_param(brcmf_arp_enable, uint, 0);
 
-/* Global Pkt filter enable control */
-uint brcmf_pkt_filter_enable = true;
-module_param(brcmf_pkt_filter_enable, uint, 0);
-
-/*  Pkt filter init setup */
-uint brcmf_pkt_filter_init;
-module_param(brcmf_pkt_filter_init, uint, 0);
-
-/* Pkt filter mode control */
-uint brcmf_master_mode = true;
-module_param(brcmf_master_mode, uint, 0);
-
 /* Contorl fw roaming */
 uint brcmf_roam = 1;