staging: brcm80211: remove fullmac module_param for ARP offload feature

Use macro to replace global variable for ARP offload configuration

Reported-by: Johannes Berg <johannes@sipsolutions.net>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/brcm80211/brcmfmac/dhd.h b/drivers/staging/brcm80211/brcmfmac/dhd.h
index e543640f9627fe6c54e1301bc23cb9b45e196eeb..de3f914d7a4f30f1c184e5d501188daa4220df51 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/dhd.h
+++ b/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/drivers/staging/brcm80211/brcmfmac/dhd_common.c b/drivers/staging/brcm80211/brcmfmac/dhd_common.c
index 2e8db62565025f3501a35ae3d5bd03fce19de0ec..02c022ab9ffaad2610189a95709cfaa614b5ec1b 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/dhd_common.c
+++ b/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/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
index 3b2d500ced8ee6ba46bcfce0b9390831b063477f..643c9c20ea91cac22fb081a79864017805bbebbe 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+++ b/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);